]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 23:33:12 +0000 (10:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 23:33:12 +0000 (10:33 +1100)
commitdcfb7dbdaa22c48971040a26a37f16165841717e
treee38907349995d8d699fc9d63d41d5f45e32cb755
parent4ffa0fabf2a55c69538f15c08848d6670636c977
parent738b2fa80fcdc5588ad90556112608ef1a60d9e7
Merge remote-tracking branch 'arm/for-next'

Conflicts:
arch/arm/mach-mxs/mach-m28evk.c
arch/arm/mach-mxs/mach-stmp378x_devb.c
18 files changed:
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/board-mx51_babbage.c
arch/arm/mach-mx5/board-mx53_evk.c
arch/arm/mach-mx5/board-mx53_loco.c
arch/arm/mach-mx5/board-mx53_smd.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-omap2/board-rx51-peripherals.c
arch/arm/mach-prima2/prima2.c
arch/arm/mach-s5pv210/mach-smdkv210.c
mm/vmalloc.c