]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 00:37:35 +0000 (11:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 00:37:35 +0000 (11:37 +1100)
commitfd4a2226d4ca2e169f09ed1b6cff9491ba6809a5
tree4d74210836ec6cdc1370a42576ac5bfe8f84ede9
parent06e2bc4ca1d5215d96522f23a361405559e3535c
parent4697d8896fc85bb6bcd835df60094c17742cbfa8
Merge remote-tracking branch 'arm/for-next'

Conflicts:
arch/arm/mach-mxs/mach-m28evk.c
arch/arm/mach-mxs/mach-stmp378x_devb.c
12 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/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
mm/vmalloc.c