]> rtime.felk.cvut.cz Git - linux-imx.git/commit
projects / linux-imx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 84e4526 6ea0624)
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)
commit64b4aaf0250c37e86aa12ecaab7e0108ecd88382
tree08ab45a0abbf36fc0f10e295c3047f16342d2f38tree | snapshot
parent84e4526f88e5904509f0226dfabdbbc9d99c7db3commit | diff
parent6ea062475a9a2ea6e1394487fa0e51b3459957d1commit | 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
Local Linux development repo for Freescale iMX