From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 11 Mar 2013 20:52:28 +0000 (+0100)
Subject: Merge tag 'mxs-fixes-3.9-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into... 
X-Git-Tag: v3.9-rc3~29^2~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fc77b0e957c3e2e8234f0d815c44fb6053e4797a;p=~emulex%2Finfiniband.git

Merge tag 'mxs-fixes-3.9-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

From Shawn Guo <shawn.guo@linaro.org>:

The 2nd mxs fixes for 3.9:
 - Fix an error caused by incorrect conflict resolution when
   applying the patch

* tag 'mxs-fixes-3.9-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: cfa10049: Fix fb initialisation function

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

fc77b0e957c3e2e8234f0d815c44fb6053e4797a