tree 6a40a1356d4fef0a8a6894f27a7cede56ca19220
parent 366a700f3afb31fe15a273f8a1581519ab846abe
parent 3342e4870bb5b7ec5c2b10f37df23cf23b6b923b
author Linux Build Service Account <lnxbuild@localhost> 1370460028 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1370460028 -0700

Merge "             1. update timeout for both tcp and udp connections              2. To update udp connections timeout value use ip_conntrack_udp_timeout_stream              3. To update tcp connection timeout value use ip_conntrack_tcp_timeout_established              4. Start inotify thread to read update udp/tcp timeout values""