| commit | fc77b0e957c3e2e8234f0d815c44fb6053e4797a | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Mar 11 21:52:28 2013 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Mar 11 21:52:57 2013 +0100 |
| tree | ad3228a866c4265e70bd109658431a7184a45d59 | |
| parent | 2a6ad871a10ce915a300d8f227168ad4c34936ec [diff] | |
| parent | 4a38a8502b0ea4ecbe86f60e0b2416771c51888d [diff] |
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>