From: Olof Johansson <olof@lixom.net>
Date: Tue, 22 Jan 2013 08:22:12 +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~1530^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2555b877bf9faf7045ae362ca051590e79167cf;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 -rc.

This contains a single compilation fix for the CODA driver.

* tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
  [media] coda: Fix build due to iram.h rename
---

b2555b877bf9faf7045ae362ca051590e79167cf