]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ixp4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 04:25:24 +0000 (15:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 04:25:24 +0000 (15:25 +1100)
1  2 
drivers/char/hw_random/Kconfig
drivers/crypto/Kconfig

Simple merge
Simple merge