Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Aug 2010 21:28:20 +0000 (14:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Aug 2010 21:28:20 +0000 (14:28 -0700)
commitcd816a0d84377c4e87f55cbe934a23417f9f5743
tree8834341f81dc570f9f255af57ac28041c317226a
parent0d9f9e122c74583de15a86d1c660c08dc298f2c8
parenta7a387cc596278af1516c534b50cc0bee171129d
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 build error.