diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2012-11-13 13:48:02 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-13 13:48:02 +0100 |
| commit | 97b129be91bc978a205db24241840b95cfa28325 (patch) | |
| tree | c9a431561f738d39a1a2c6dbed94af838f7d3b35 /tools/perf/scripts/python/event_analyzing_sample.py | |
| parent | ARM: highbank: use common debug_ll_io_init (diff) | |
| parent | sh: clkfwk: fixup unsed variable warning (diff) | |
| download | linux-dev-97b129be91bc978a205db24241840b95cfa28325.tar.xz linux-dev-97b129be91bc978a205db24241840b95cfa28325.zip | |
Merge branch 'soc4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc2
Its a little embarrassing, but they all fix problems introduced
in previous pull-requests for 3.8 that have been merged.
* The three Revert patches back-out secondary CPU initialisation
changes from Bastian Hecht which he as advised me are incorrect
and break secondary CPU initialisation.
* The clkfwk patch from Morimoto-san resolves a build warning.
* 'soc4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
sh: clkfwk: fixup unsed variable warning
Revert "ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode"
Revert "ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode"
Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode"
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'tools/perf/scripts/python/event_analyzing_sample.py')
0 files changed, 0 insertions, 0 deletions