]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'i.MX/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 00:01:27 +0000 (11:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 00:01:27 +0000 (11:01 +1100)
commit70a61611da1ae30c91e93fb5d85fdfaea9a30ce0
tree65d55182545c1b3fa1577760c47c7cd8fb4fea3d
parent740437142865c23670c5f5b22176ad112237c6a3
parent5788f4d617769d5f5b8ffa88d6015f4390229855
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/mach-mx5/mm.c
arch/arm/plat-mxc/include/mach/hardware.h
arch/arm/mach-mxs/clock-mx28.c