]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ixp4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 05:57:27 +0000 (15:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 05:57:27 +0000 (15:57 +1000)
commit8e626d52dca323b6a89001d8f7b493569af51d73
tree61e96ac9d006d80de4d903795a8e1c3abbae9ecb
parentfc68aa68d0eb2a4b56d719a966fcf973587ba733
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