]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'omap4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorOlof Johansson <olof@lixom.net>
Sun, 11 Dec 2011 23:56:22 +0000 (15:56 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 11 Dec 2011 23:56:22 +0000 (15:56 -0800)

Trivial merge