From: Linus Torvalds 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: v2.6.36-rc4~76 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e6f901bb85bc0707aaafb3c123c3013c0feaba7d;p=~emulex%2Finfiniband.git 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: 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