]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 03:21:40 +0000 (14:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 03:21:40 +0000 (14:21 +1100)
commit57ddcad46d009245f2336c2446e9486e9e7d80b3
tree10c6a5f838be7dc09376cf0c29032e9d50741770
parentbe36e7b78c74390a5c0d57a64212be573a52f240
parent5b2660326039a32b28766cb4c1a8b1bdcfadc375
Merge remote-tracking branch 'security/next'

Conflicts:
lib/digsig.c
security/integrity/ima/ima_main.c
lib/digsig.c
security/integrity/evm/evm_crypto.c
security/integrity/ima/ima.h
security/integrity/ima/ima_main.c
security/integrity/ima/ima_policy.c