| commit | 64b4aaf0250c37e86aa12ecaab7e0108ecd88382 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 08 09:36:38 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 08 09:36:38 2013 -0700 |
| tree | 08ab45a0abbf36fc0f10e295c3047f16342d2f38 | |
| parent | 84e4526f88e5904509f0226dfabdbbc9d99c7db3 [diff] | |
| parent | 6ea062475a9a2ea6e1394487fa0e51b3459957d1 [diff] |
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