Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Mar 2013 15:26:15 +0000 (08:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Mar 2013 15:26:15 +0000 (08:26 -0700)
commit4b767155ffad4be0aaafeead585ad21375dc7475
treee1985f52fd4807cb9d85b975fbd42ea0795ccf13
parent991657a39dff76c81e7dbcd0b1f8e56a0ff36aa7
parent4502403dcf8f5c76abd4dbab8726c8e4ecb5cd34
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull selinux bugfix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selinux: use GFP_ATOMIC under spin_lock