]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'integrity/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 03:23:27 +0000 (13:23 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 03:23:27 +0000 (13:23 +1000)
1  2 
security/integrity/evm/evm_crypto.c
security/integrity/evm/evm_main.c

Simple merge
Simple merge