]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'imx6/boards' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 05:23:44 +0000 (21:23 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 05:23:44 +0000 (21:23 -0800)

Trivial merge