]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ixp4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 04:35:02 +0000 (14:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 04:35:02 +0000 (14:35 +1000)
Conflicts:
arch/arm/mach-ixp4xx/common.c
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h

1  2 
drivers/char/hw_random/Kconfig
drivers/crypto/Kconfig

Simple merge
Simple merge