]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ixp4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 05:08:18 +0000 (15:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 05:08:18 +0000 (15:08 +1000)
commit27084a5c3a090e48c3be437851b9d8a629675f70
tree7f737eeaee477f226561ac808c6aac02b8cd3c9e
parent3ab481ed060435923c7a6b466a888a9eaf747fa1
parent1d2d793aaa393bbc25b6b26e45989d3b9d4d83b9
Merge remote-tracking branch 'ixp4xx/next'

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