Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
commit7de8e5737df31a6826015a65135ed8f0a32bb2c4
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Mar 2011 00:51:27 +0000 (28 17:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Mar 2011 00:51:27 +0000 (28 17:51 -0700)
treeb2d2f1bfc200c3209cecd2be1d3039179b1b14a0
parentb5b4bc32b68d711f8b79a1d60e35892d761417c7
parent85cd6da53a8073d3f4503f56e4ea6cddccbb1c7f
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:
  selinux: Fix regression for Xorg