]> 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>
Sun, 6 Nov 2011 23:35:41 +0000 (10:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 6 Nov 2011 23:35:41 +0000 (10:35 +1100)
commit9c8f5e084dd0a7bc1fd7ada112bf83d63c832582
tree4b2fe16bbb62b2aaaa86bca02e1acb103dc88390
parent36b70c11788a5d0e5302ef1da0d696d43735a72a
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