From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Aug 2010 01:37:03 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.36-rc2~45
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b89f56783a4ef796190ef1192c25e72e0b986b6;p=platform%2Fkernel%2Flinux-3.10.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 task_setrlimit prototype
---

3b89f56783a4ef796190ef1192c25e72e0b986b6