tree b084b95ae3fc985e6f6f21157c783700c829de9a
parent 4c3b01f71181a52ab7735a7c52b1aa2232826075
parent 869ab5147e1eead890245cfd4f652ba282b6ac26
author Linus Torvalds <torvalds@linux-foundation.org> 1207620935 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1207620935 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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