]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Dec 2011 23:51:18 +0000 (10:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Dec 2011 23:51:18 +0000 (10:51 +1100)
commit4f1f11f9461c0dfe42b65328a0862322416b2e79
treebbd45ddd10d3aec442a888365fded09464f79cf4
parent37985239c335cb0c0fae003a738185d6739d5928
parentc23b4581d8d2d30078ce0a2023faf33832c70d54
Merge remote-tracking branch 'arm/for-next'

Conflicts:
arch/arm/mach-mxs/mach-m28evk.c
arch/arm/mach-mxs/mach-stmp378x_devb.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-davinci/board-da850-evm.c
arch/arm/mach-davinci/board-dm365-evm.c
arch/arm/mach-davinci/board-dm646x-evm.c
arch/arm/mach-davinci/dm646x.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-mx5/imx51-dt.c
arch/arm/mach-mx5/imx53-dt.c
arch/arm/mach-mxs/mach-m28evk.c
arch/arm/mach-mxs/mach-stmp378x_devb.c
arch/arm/mach-prima2/prima2.c