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)
commit7180c4c9e09888db0a188f729c96c6d7bd61fa83
treeb084b95ae3fc985e6f6f21157c783700c829de9a
parent4c3b01f71181a52ab7735a7c52b1aa2232826075
parent869ab5147e1eead890245cfd4f652ba282b6ac26
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/selinux-2.6

* '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