Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Apr 2008 02:15:35 +0000 (19:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Apr 2008 02:15:35 +0000 (19:15 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: more GFP_NOFS fixups to prevent selinux from re-entering the fs code


Trivial merge