]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
projects / thirdparty / kernel / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 75d3969) | patch
ARM: dts: msm: Fix merge resolution
authorDavid Brown <davidb@codeaurora.org>
Mon, 17 Jun 2013 20:39:38 +0000 (13:39 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 18 Jun 2013 07:29:05 +0000 (00:29 -0700)
commitf333c13c9eb0504ff01b7d9c242a9f2f2f2edc7b
treef8a9950a805f3652cd7cd23bb727db2accf39ef9tree | snapshot
parent75d39696d31fa8ef4a099a37d1b6b4e91c9a8775commit | 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>
arch/arm/boot/dts/msm8960-cdp.dts diff | blob | blame | history
A mirror of Linus' kernel repository