| commit | 172f993a2941ec60685c7e33af8be701759de1ab | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 30 11:21:12 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 30 11:21:12 2012 -0700 |
| tree | 2ee072d56de4a1bfe4ee6873941870837162ffba | |
| parent | 7272c30b6fbc051bf8a3f3c973e64f230c91c8b3 [diff] | |
| parent | e3fea3f70fd68af0574a5f24246cdb4ed07f2b74 [diff] |
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