diff options
author | David S. Miller | 2015-12-09 04:01:38 +0100 |
---|---|---|
committer | David S. Miller | 2015-12-09 04:01:38 +0100 |
commit | bc9b145a092aca91a7f6ef40cdb3628b6ada7ec9 (patch) | |
tree | 60407a8c19e907a91c736fb95f1a30186a7542d5 /include/net/sock.h | |
parent | Revert "Merge branch 'vsock-virtio'" (diff) | |
parent | cgroup: implement cgroup_get_from_path() and expose cgroup_put() (diff) | |
download | kernel-qcow2-linux-bc9b145a092aca91a7f6ef40cdb3628b6ada7ec9.tar.gz kernel-qcow2-linux-bc9b145a092aca91a7f6ef40cdb3628b6ada7ec9.tar.xz kernel-qcow2-linux-bc9b145a092aca91a7f6ef40cdb3628b6ada7ec9.zip |
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>
Diffstat (limited to 'include/net/sock.h')
0 files changed, 0 insertions, 0 deletions