Merge branch 'for-4.5-ancestor-test' of git://git.kernel.org/pub/scm/linux/kernel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 9 Dec 2015 03:01:38 +0000 (22:01 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Dec 2015 03:01:38 +0000 (22:01 -0500)
Preparatory changes for some new socket cgroup infrastructure
and netfilter targets.

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge