From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 7 Aug 2012 09:22:14 +0000 (+0200)
Subject: Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
X-Git-Tag: v3.6-rc2~20^2~10
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=376249cf57b4e5516ba88f8ed8d45272e793cfb9;p=linux.git

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

ARM i.MX fixes for 3.6-rc

* tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  i.MX27: Fix emma-prp and csi clocks.
  ARM: clk-imx31: Fix the keypad clock name
  ARM: dts: imx27-3ds.dts: Fix serial console node
---

376249cf57b4e5516ba88f8ed8d45272e793cfb9