tree d46ddaa86089148e39ba91ddf58430bb1d235748
parent 603d04b2010976a52f62b7633f9999d104046900
parent a5b2c5b2ad5853591a6cac6134cd0f599a720865
author Linus Torvalds <torvalds@linux-foundation.org> 1306913737 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1306913737 +0900

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:
  AppArmor: fix oops in apparmor_setprocattr