diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 11:21:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 11:21:12 -0700 |
| commit | 172f993a2941ec60685c7e33af8be701759de1ab (patch) | |
| tree | 2ee072d56de4a1bfe4ee6873941870837162ffba /scripts | |
| parent | Merge tag 'dm-3.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm (diff) | |
| parent | selinux: fix selinux_inode_setxattr oops (diff) | |
| download | linux-dev-172f993a2941ec60685c7e33af8be701759de1ab.tar.xz linux-dev-172f993a2941ec60685c7e33af8be701759de1ab.zip | |
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 'scripts')
0 files changed, 0 insertions, 0 deletions