]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ixp4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 04:54:45 +0000 (14:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 04:54:45 +0000 (14:54 +1000)
commit49325e9e6c64a04762e98a0e7f76ba1af65eea51
tree26a401d8a79feccce7bb80a4bde6f086b1809075
parent76cb92fe47f2215a178fef13d7d447c7740ac292
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