]> 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, 11 Dec 2011 23:49:58 +0000 (10:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 11 Dec 2011 23:49:58 +0000 (10:49 +1100)
commit3c35506380f1c0c3e8ff259ef197a2c789746e5b
tree58faadf0199d4041e600f3cd7ec7f024df441b77
parentb1a7f28275d2aeb40d994643300dba772712861e
parent5788f4d617769d5f5b8ffa88d6015f4390229855
Merge remote-tracking branch 'i.MX/for-next'

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