Merge remote-tracking branch 'ixp4xx/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 14 Sep 2012 06:21:09 +0000 (16:21 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 14 Sep 2012 06:21:09 +0000 (16:21 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Sep 2012 06:21:09 +0000 (16:21 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Sep 2012 06:21:09 +0000 (16:21 +1000)
diff --cc arch/arm/common/dmabounce.c
Simple merge
diff --cc drivers/char/hw_random/Kconfig
Simple merge
diff --cc drivers/crypto/Kconfig
Simple merge
diff --cc drivers/net/wan/ixp4xx_hss.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Sep 2012 06:21:09 +0000 (16:21 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Sep 2012 06:21:09 +0000 (16:21 +1000)
		1	2
arch/arm/common/dmabounce.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/hw_random/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/crypto/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/ixp4xx_hss.c	patch \|	diff1 \|	diff2 \|	blob \| history