]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit31d0421ee39cad9eb7dd628ec9e87718ddd89246
treecdc28c9b2d47e57d83b93be3007cf69f8e22360a
parentccf970e9ad19273f0266214aa561f90b51d78671
parentf333c13c9eb0504ff01b7d9c242a9f2f2f2edc7b
Merge branch 'next/cleanup' into for-next

* next/cleanup:
  ARM: dts: msm: Fix merge resolution