From: Linus Torvalds 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: MMI-PSA29.97-13-9~33677 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=732b72069e77f288efa1d5245cc699d7cb98e528;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'for-linus' of git://git./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