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

Simple merge