tree 3f5aba40b97a6e51f2aec5cc6a44dbe7310f3f2d
parent 4ba51fd75cc3789be83f0d6f878dabbb0cb19bca
parent a02fe13297af26c13d004b1d44f391c077094ea0
author Linus Torvalds <torvalds@linux-foundation.org> 1207265337 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1207265337 -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: prevent rentry into the FS