| commit | f333c13c9eb0504ff01b7d9c242a9f2f2f2edc7b | [log] [tgz] |
|---|---|---|
| author | David Brown <davidb@codeaurora.org> | Mon Jun 17 13:39:38 2013 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Tue Jun 18 00:29:05 2013 -0700 |
| tree | f8a9950a805f3652cd7cd23bb727db2accf39ef9 | |
| parent | 75d39696d31fa8ef4a099a37d1b6b4e91c9a8775 [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>