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

Simple merge