]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ixp4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 03:26:50 +0000 (14:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 03:26:50 +0000 (14:26 +1100)
commitce4808b60b0d41d664221597ad29f5c531b937b2
tree6286cc4bafc052499d4c1a1e79fb792c09a2d9c8
parent7358f8c18f247f24f15d67c1f8e52af5e0364741
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