tree 5f908da2b5b9732a99cf8a8b01a13b3c33cffd5a
parent 97c7d1ea1f80f457da78b11ca638b7096a4548ee
parent 089be43e403a78cd6889cde2fba164fefe9dfd89
author Linus Torvalds <torvalds@linux-foundation.org> 1216135008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216135008 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  Revert "SELinux: allow fstype unknown to policy to use xattrs if present"