]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 06:26:28 +0000 (17:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 06:26:28 +0000 (17:26 +1100)
1  2 
arch/x86/include/asm/cpufeature.h
include/linux/netlink.h

Simple merge
Simple merge