diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-11 00:32:57 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-11 00:32:57 -0700 |
| commit | 41f0d0c25d4ccba8de8d5f463d50265aac23ef5d (patch) | |
| tree | c519653bbcd99608baab22da39de1abd91a2c7f1 /tools/perf/scripts/python/sctop.py | |
| parent | 9ee73aec3570733dc3b9a6b4782db6b323abfa5e (diff) | |
| parent | 413bfd0e67894c930242482cd15ac09a800e2ab8 (diff) | |
Merge branch 'renesas/soc' into next/boards
Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/include/mach/r8a7778.h
arch/arm/mach-shmobile/setup-r8a7778.c
Diffstat (limited to 'tools/perf/scripts/python/sctop.py')
0 files changed, 0 insertions, 0 deletions