diff options
| author |   David Brown <davidb@codeaurora.org> | 2013-06-17 13:39:38 -0700 |
|---|---|---|
| committer |   Olof Johansson <olof@lixom.net> | 2013-06-18 00:29:05 -0700 |
| commit | f333c13c9eb0504ff01b7d9c242a9f2f2f2edc7b (patch) | |
| tree | f8a9950a805f3652cd7cd23bb727db2accf39ef9 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge tag 'sunxi-core-for-3.11' of git://github.com/mripard/linux into next/cleanup (diff) | |
| download | linux-dev-f333c13c9eb0504ff01b7d9c242a9f2f2f2edc7b.tar.xz linux-dev-f333c13c9eb0504ff01b7d9c242a9f2f2f2edc7b.zip | |
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>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions