diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-03-17 11:50:05 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 12:13:09 +0100 |
| commit | 54cab10f63f20750cd2911e353cf8068f1ecf0a5 (patch) | |
| tree | 33469b47a3cabd27b09bc9f52359f2ac3c2fa453 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
| parent | Merge tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu into next/dt (diff) | |
| parent | ARM: mvebu: move DT Dove to MVEBU (diff) | |
| download | linux-dev-54cab10f63f20750cd2911e353cf8068f1ecf0a5.tar.xz linux-dev-54cab10f63f20750cd2911e353cf8068f1ecf0a5.zip | |
Merge branch 'mvebu/soc3' into next/dt
The dts Makefile has a bunch of nasty conflicts, attempt to resolve
these now to avoid trouble later.
Conflicts:
arch/arm/boot/dts/Makefile
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions