]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ixp4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 06:18:12 +0000 (16:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 06:18:12 +0000 (16:18 +1000)
commite572b2f378df8d2768733c653b7852cccd029146
treec2d47505f8d4ed0bbf1d7da804890285c7425c4b
parent207397e6b9465625ce8f0e210b5071647da548ba
parent2346020ac8e07d1a83b8471eb86056f581d9c08c
Merge remote-tracking branch 'ixp4xx/next'

Conflicts:
arch/arm/mach-ixp4xx/common.c
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
drivers/char/hw_random/Kconfig
drivers/crypto/Kconfig