]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...
authorCasey Schaufler <cschaufler@cschaufler-intel.(none)>
Fri, 4 May 2012 19:52:54 +0000 (12:52 -0700)
committerCasey Schaufler <cschaufler@cschaufler-intel.(none)>
Fri, 4 May 2012 19:52:54 +0000 (12:52 -0700)
commitb065bb7bbe9432d9cf62fe6856267765d42895e6
tree1952ef794f843b04bf0c7874c9002faa17113b24
parentbbe5d6bcc81c0eb28e08cef7a9e1f7663c2bf5f4
parent898bfc1d46bd76f8ea2a0fbd239dd2073efe2aa3
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
security/smack/smack_lsm.c