]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:08:06 +0000 (11:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:08:06 +0000 (11:08 +1100)
commit5e58c246499aa046f6ad813f2ce30d939c5abf26
treedfabab7424fe081c6081a5b4777a74f1a23a8b0f
parent931fe918bd76dd7849a2c1f8fa3a7cc9edb01918
parent738b2fa80fcdc5588ad90556112608ef1a60d9e7
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