]> 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, 13 Nov 2011 23:42:42 +0000 (10:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 13 Nov 2011 23:42:42 +0000 (10:42 +1100)
commitde5aa2154723f3828873c97cd52c40e8630d6589
tree7f9891c9291771109f8a4f09109292d70841a9bc
parent050fc847e31fba66176c5510f68f9658c1e319c1
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