Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jun 2011 07:35:37 +0000 (16:35 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jun 2011 07:35:37 +0000 (16:35 +0900)
commit5c6cce92bc8aee751aafe82c5d9caf7553226a3d
treed46ddaa86089148e39ba91ddf58430bb1d235748
parent603d04b2010976a52f62b7633f9999d104046900
parenta5b2c5b2ad5853591a6cac6134cd0f599a720865
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:
  AppArmor: fix oops in apparmor_setprocattr