From: Casey Schaufler <cschaufler@cschaufler-intel.(none)>
Date: Wed, 23 May 2012 22:02:15 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux... 
X-Git-Tag: next-20121205~58^2~22
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7aab79999335a969d2f31a3ffdf3d6ef5cadd1ea;p=karo-tx-linux.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
---

7aab79999335a969d2f31a3ffdf3d6ef5cadd1ea