]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Jul 2008 15:16:48 +0000 (08:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Jul 2008 15:16:48 +0000 (08:16 -0700)
commit732b72069e77f288efa1d5245cc699d7cb98e528
tree5f908da2b5b9732a99cf8a8b01a13b3c33cffd5a
parent97c7d1ea1f80f457da78b11ca638b7096a4548ee
parent089be43e403a78cd6889cde2fba164fefe9dfd89
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"