]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc259577c2cc050596b73fdcdc83218da0d6bdd6d
treed46ddaa86089148e39ba91ddf58430bb1d235748
parent58a2d2b177ca60e8409d25dc21068ce2039eba11
parent5ff2c940b5580abddf332118cc10f8b73e8c45c6
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