From: Olof Johansson <olof@lixom.net>
Date: Tue, 18 Jun 2013 07:29:15 +0000 (-0700)
Subject: Merge branch 'next/cleanup' into for-next
X-Git-Tag: next-20130619~15^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=31d0421ee39cad9eb7dd628ec9e87718ddd89246;p=karo-tx-linux.git

Merge branch 'next/cleanup' into for-next

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

31d0421ee39cad9eb7dd628ec9e87718ddd89246