]> 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)>
Wed, 11 Apr 2012 00:04:22 +0000 (17:04 -0700)
committerCasey Schaufler <cschaufler@cschaufler-intel.(none)>
Wed, 11 Apr 2012 00:04:22 +0000 (17:04 -0700)
commit4e17ca8c77a8b1b9bc0ff48e02998a468a0d7d0d
tree08e3ea9ff4c0f61175218de42b7a9549cd9cec7b
parent78b58ef33773674db755ef8d861d6ff407d1088e
parent9ccf010f8172b699ea80178860e8ea228f7dce56
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
security/smack/smack.h
security/smack/smack_lsm.c