From: David Brown <davidb@codeaurora.org>
Date: Mon, 17 Jun 2013 20:39:38 +0000 (-0700)
Subject: ARM: dts: msm: Fix merge resolution
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~72^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f333c13c9eb0504ff01b7d9c242a9f2f2f2edc7b;p=pandora-kernel.git

ARM: dts: msm: Fix merge resolution

Commit e45600107b (Merge tag 'msm-cleanup-for-3.11' of
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into
next/cleanup) incorrectly resolved a merge conflict, resulting in a
node address that doesn't match the register address.

Fix this node address.

Signed-off-by: David Brown <davidb@codeaurora.org>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
---

Reading git-diff-tree failed