From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 15 Mar 2013 14:31:20 +0000 (+0100)
Subject: Merge tag 'arm-imx-fixes-for-3.9-rc' of git://git.pengutronix.de/git/imx/linux-2... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c06e51db93a9fe018b58204125e08627011a8316;p=linux-beck.git

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

From Sascha Hauer <s.hauer@pengutronix.de>:

Two small ARM i.MX fixes for v3.9-rc

- Fix i.MX25 DT compilation
- Enable MAX clk on i.MX35

* tag 'arm-imx-fixes-for-3.9-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: i.MX35: enable MAX clock
  ARM: i.MX25: Fix DT compilation

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

c06e51db93a9fe018b58204125e08627011a8316