From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Sep 2010 02:13:06 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: upstream/snapshot3+hdmi~13083
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6f901bb85bc0707aaafb3c123c3013c0feaba7d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.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:
  ima: always maintain counters
  AppArmor: Fix locking from removal of profile namespace
  AppArmor: Fix splitting an fqname into separate namespace and profile names
  AppArmor: Fix security_task_setrlimit logic for 2.6.36 changes
  AppArmor: Drop hack to remove appended " (deleted)" string
---

e6f901bb85bc0707aaafb3c123c3013c0feaba7d