]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f7b8628 0d5a71c)
Merge tag 'mxs-fixes-3.9-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorArnd Bergmann <arnd@arndb.de>
Mon, 11 Mar 2013 20:52:28 +0000 (21:52 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 11 Mar 2013 20:52:57 +0000 (21:52 +0100)
commit2bb4ea5e3039673e49a5c5c1b132614b1ef17f30
treead3228a866c4265e70bd109658431a7184a45d59tree | snapshot
parentf7b862860a67f50ce4e2468f3ce7c5e959f94ac8commit | diff
parent0d5a71c076216706dd876f46bbc30a94d7788eb1commit | 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>
Linux Kernel Source Tree.