]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'ux500/devel' into next/devel
authorOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 20:18:29 +0000 (12:18 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 20:18:29 +0000 (12:18 -0800)

Trivial merge