summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-30 11:21:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-30 11:21:12 -0700
commit172f993a2941ec60685c7e33af8be701759de1ab (patch)
tree2ee072d56de4a1bfe4ee6873941870837162ffba /Makefile
parent7272c30b6fbc051bf8a3f3c973e64f230c91c8b3 (diff)
parente3fea3f70fd68af0574a5f24246cdb4ed07f2b74 (diff)
downloadop-kernel-dev-172f993a2941ec60685c7e33af8be701759de1ab.zip
op-kernel-dev-172f993a2941ec60685c7e33af8be701759de1ab.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem bugfixes from James Morris. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: selinux: fix selinux_inode_setxattr oops KEYS: linux/key-type.h needs linux/errno.h smack: off by one error
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud