summaryrefslogtreecommitdiff
path: root/usr/Makefile
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-06-15 03:41:48 +0400
committerJames Morris <jmorris@namei.org>2011-06-15 03:41:48 +0400
commit82b88bb24e28dd4fb4bec30e75412f41326130f0 (patch)
tree61b1d0eb6ae6059e879571517a0f36bcffdabf34 /usr/Makefile
parent60b8b1de0dd2bf246f0e074d287bb3f0bc42a755 (diff)
parentded509880f6a0213b09f8ae7bef84acb16eaccbf (diff)
downloadlinux-82b88bb24e28dd4fb4bec30e75412f41326130f0.tar.xz
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus
Diffstat (limited to 'usr/Makefile')
0 files changed, 0 insertions, 0 deletions