]> 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>
Sun, 12 Jun 2011 02:56:25 +0000 (19:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Jun 2011 02:56:25 +0000 (19:56 -0700)
commit7ed847f8e24d28195bc8c524d68c515e7b34cc0d
treef4226d85217786aceb727aa53040cefc4ab2ea75
parentdd5b3b06280f02a22a94289437fc89c021e1702b
parent6b98d5f74cd153b65698b88b9a6a7d8404fbad63
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 sleep in invalid context from task_setrlimit