Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Apr 2008 23:28:57 +0000 (16:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Apr 2008 23:28:57 +0000 (16:28 -0700)
commite315c121a858499d84dc88c499046b9f10bb61ec
tree3f5aba40b97a6e51f2aec5cc6a44dbe7310f3f2d
parent4ba51fd75cc3789be83f0d6f878dabbb0cb19bca
parenta02fe13297af26c13d004b1d44f391c077094ea0
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: prevent rentry into the FS