Merge "netfilter: conntrack: disable generic tracking for known protocols" into tizen_2.4
authorSangho Park <sangho1206.park@samsung.com>
Fri, 13 Mar 2015 02:01:11 +0000 (11:01 +0900)
committerGerrit Code Review <gerrit@tizensrc>
Fri, 13 Mar 2015 02:01:11 +0000 (11:01 +0900)

Trivial merge