]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 02:16:52 +0000 (12:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 02:16:52 +0000 (12:16 +1000)
1  2 
arch/x86/include/asm/cpufeature.h

Simple merge