]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commitbc9b145a092aca91a7f6ef40cdb3628b6ada7ec9
tree60407a8c19e907a91c736fb95f1a30186a7542d5
parent8ac2837c89c8c0fcad557e4380aeef80580390f9
parent16af439645455fbf36984ca5e72f31073ee19ab7
Merge branch 'for-4.5-ancestor-test' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Preparatory changes for some new socket cgroup infrastructure
and netfilter targets.

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