projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0db7bd8 d52fc5d)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Apr 2012 20:23:44 +0000 (13:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Apr 2012 20:23:44 +0000 (13:23 -0700)
Pull security subsystem fixes from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  fcaps: clear the same personality flags as suid when fcaps are used
  mpi: Avoid using freed pointer in mpi_lshift_limbs()
  Smack: move label list initialization


Trivial merge
John Crispins staging tree