summaryrefslogtreecommitdiffstats
path: root/security/selinux/ss
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-05-24 14:55:24 +0200
committerJames Morris <jmorris@namei.org>2011-05-24 14:55:24 +0200
commit434d42cfd05a7cc452457a81d2029540cba12150 (patch)
tree3a6b9b7f9ff2e1b7409dd66c15242b2a75aa4422 /security/selinux/ss
parentMerge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let... (diff)
parentMerge branch 'master' into next (diff)
downloadlinux-434d42cfd05a7cc452457a81d2029540cba12150.tar.xz
linux-434d42cfd05a7cc452457a81d2029540cba12150.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/ss')
0 files changed, 0 insertions, 0 deletions