]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ixp4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 02:48:20 +0000 (13:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 02:48:20 +0000 (13:48 +1100)
commit7b73323ab8b679ecb2d1540325fdfb28a6292aa4
tree75a4c11081e6861a20b5b9fe92fb47084e213f23
parent8f9c542c67fb062ae357b7736114c4667960fd0e
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