From: Olof Johansson <olof@lixom.net>
Date: Tue, 18 Dec 2012 02:40:51 +0000 (-0800)
Subject: Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
X-Git-Tag: v3.12-rc1~1700^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1dc1d2e9485074d5f495beb7771a3ab20eb504e9;p=kernel%2Fkernel-generic.git

Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

From Sascha Hauer:

ARM i.MX fixes for v3.8-rc

This fixes a compile failure on imx_v4_v5_defconfig and a regression
introduced with enabling the MIPI clocks on i.MX51. Also one rather
cosmetic fix for the i.MX27 dts file.

* tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx: Move platform-mx2-emma to arch/arm/mach-imx/devices
  ARM i.MX51 clock: Fix regression since enabling MIPI/HSP clocks
  ARM: dts: mx27: Fix the AIPI bus for FEC
---

1dc1d2e9485074d5f495beb7771a3ab20eb504e9