Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Mar 2011 00:51:27 +0000 (17:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Mar 2011 00:51:27 +0000 (17:51 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  selinux: Fix regression for Xorg


Trivial merge