]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ixp4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 02:06:59 +0000 (13:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 02:06:59 +0000 (13:06 +1100)
commit56ade9ae6f33d19d426b6e4e7d72518d825d77ac
tree0420898525a25656d5b0c6d1fa2c17d6e6360b86
parent5d39084f9b23b1348bf1d1e1e11246fa8b580e7e
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