]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/devel' into for-next
authorOlof Johansson <olof@lixom.net>
Sun, 11 Dec 2011 23:58:32 +0000 (15:58 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 11 Dec 2011 23:58:32 +0000 (15:58 -0800)

Trivial merge