| commit | bc9b145a092aca91a7f6ef40cdb3628b6ada7ec9 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Dec 08 22:01:38 2015 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Tue Dec 08 22:01:38 2015 -0500 |
| tree | 60407a8c19e907a91c736fb95f1a30186a7542d5 | |
| parent | 8ac2837c89c8c0fcad557e4380aeef80580390f9 [diff] | |
| parent | 16af439645455fbf36984ca5e72f31073ee19ab7 [diff] |
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>