diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-08 09:36:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-08 09:36:38 -0700 |
| commit | 64b4aaf0250c37e86aa12ecaab7e0108ecd88382 (patch) | |
| tree | 08ab45a0abbf36fc0f10e295c3047f16342d2f38 /fs/ext4/inode.c | |
| parent | Merge tag 'regulator-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator (diff) | |
| parent | Smack: IPv6 casting error fix for 3.11 (diff) | |
| download | linux-dev-64b4aaf0250c37e86aa12ecaab7e0108ecd88382.tar.xz linux-dev-64b4aaf0250c37e86aa12ecaab7e0108ecd88382.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security layer fix from James Morris:
"Smack casting fix"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
Smack: IPv6 casting error fix for 3.11
Diffstat (limited to 'fs/ext4/inode.c')
0 files changed, 0 insertions, 0 deletions