]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ixp4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 06:23:47 +0000 (16:23 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 06:23:47 +0000 (16:23 +1000)
1  2 
arch/arm/common/dmabounce.c
drivers/char/hw_random/Kconfig
drivers/crypto/Kconfig
drivers/net/wan/ixp4xx_hss.c

Simple merge
Simple merge
Simple merge
Simple merge