From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Mar 2011 00:51:27 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v3.0~1121
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7de8e5737df31a6826015a65135ed8f0a32bb2c4;p=platform%2Fkernel%2Flinux-amlogic.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:
  selinux: Fix regression for Xorg
---

7de8e5737df31a6826015a65135ed8f0a32bb2c4