]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/cleanup' into for-next
authorOlof Johansson <olof@lixom.net>
Tue, 18 Jun 2013 07:29:15 +0000 (00:29 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 18 Jun 2013 07:29:15 +0000 (00:29 -0700)
* next/cleanup:
  ARM: dts: msm: Fix merge resolution


Trivial merge