From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Jun 2011 02:56:25 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b99ca60c83a631adaba9c2fff8f2dd14d3517a61;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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 sleep in invalid context from task_setrlimit
---

b99ca60c83a631adaba9c2fff8f2dd14d3517a61