]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Aug 2013 16:36:38 +0000 (09:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Aug 2013 16:36:38 +0000 (09:36 -0700)
commitce72f41202e716554af4279e9f327a429374dc2c
tree08ab45a0abbf36fc0f10e295c3047f16342d2f38
parentfcd3bc526068c1f2a328b1a617671a919d4b1a02
parentf76c0fd7c79cbc48595953f4005070f9da330635
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