tree b2d2f1bfc200c3209cecd2be1d3039179b1b14a0
parent b5b4bc32b68d711f8b79a1d60e35892d761417c7
parent 85cd6da53a8073d3f4503f56e4ea6cddccbb1c7f
author Linus Torvalds <torvalds@linux-foundation.org> 1301359887 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1301359887 -0700

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:
  selinux: Fix regression for Xorg