]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' into for-next
authorOlof Johansson <olof@lixom.net>
Fri, 7 Sep 2012 22:10:06 +0000 (15:10 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 7 Sep 2012 22:10:06 +0000 (15:10 -0700)

Trivial merge