]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 11 Dec 2011 23:41:48 +0000 (10:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 11 Dec 2011 23:41:48 +0000 (10:41 +1100)
commit33e44cca1afd2c53981fbb760526a4bd26c68b8e
treee5b281550fa5cf4fcd0460a8b7ee451a9419b302
parent001298ba17639ee7ff2f7ca0e2cb9070760d5dcc
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