Merge tag 'imx-fixes-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorOlof Johansson <olof@lixom.net>
Tue, 5 Mar 2013 01:33:21 +0000 (17:33 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 5 Mar 2013 01:35:01 +0000 (17:35 -0800)
commit260a8e507a8e066b52e299224296cd6fe370932e
treeb66d6f8d2f2a4f8343e0ce962550326de7750dfc
parent984b839337da1eb7b4a4fb50e24cf28c2b473862
parent0545c798e9bb7fe29606681653c20d68e47f4840
Merge tag 'imx-fixes-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

From Shawn Guo:
The imx fixes for 3.9:
 - move early resume code out of .data section to fix allyesconfig
   failure since c08e20d (arm: Add v7_invalidate_l1 to cache-v7.S)
   gets merged
 - Fix incorrect DISP1_DAT_21 number in imx53-mba53 disp1-grp1

* tag 'imx-fixes-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: dts: imx53-mba53: fix fsl,pins for disp1-grp1
  ARM: mach-imx: move early resume code out of the .data section

Signed-off-by: Olof Johansson <olof@lixom.net>