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)
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


Trivial merge