git.karo-electronics.de Git - karo-tx-linux.git/commit

author	David Brown <davidb@codeaurora.org>
	Mon, 17 Jun 2013 20:39:38 +0000 (13:39 -0700)
committer	David Brown <davidb@codeaurora.org>
	Tue, 25 Jun 2013 22:37:29 +0000 (15:37 -0700)
commit	d701eda5ef391ffa071617de1f7f3558c6841250
tree	9ec3998d5baef276f3e3da70368dbdcd87eb91b7	tree \| snapshot
parent	6e94a5b9d4a0ba6ff6a95b09f8d0f9f135e2dc36	commit \| diff

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>
[cherry picked into msm for-next by davidb@codeaurora.org]