From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Jul 2008 15:16:48 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.27-rc1~1089
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=732b72069e77f288efa1d5245cc699d7cb98e528;p=linux-2.6-omap-h63xx.git

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"
---

732b72069e77f288efa1d5245cc699d7cb98e528