Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata', ...

diff --cc arch/arm/mach-imx/Kconfig
Simple merge

diff --cc arch/arm/mach-imx/clock-imx27.c
Simple merge

diff --cc arch/arm/mach-imx/clock-imx31.c
Simple merge

diff --cc arch/arm/mach-imx/clock-imx35.c
Simple merge

diff --cc arch/arm/mach-mx5/Kconfig
Simple merge

diff --cc arch/arm/mach-mx5/clock-mx51-mx53.c
Simple merge

diff --cc arch/arm/mach-mx5/mx51_efika.c
Simple merge