From: Casey Schaufler <cschaufler@cschaufler-intel.(none)>
Date: Wed, 11 Apr 2012 00:04:22 +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~26
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4e17ca8c77a8b1b9bc0ff48e02998a468a0d7d0d;p=karo-tx-linux.git

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

4e17ca8c77a8b1b9bc0ff48e02998a468a0d7d0d