diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-12 16:09:22 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-12 16:10:00 -0800 |
| commit | 4a76411ea3f1da9032e031f8fff8894b97d141b2 (patch) | |
| tree | 59976175d70b6e08aacd4abf7090919d3b78fc29 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'next/pm-samsung' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Merge tag 'omap-for-v3.8/clock-signed' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| download | linux-4a76411ea3f1da9032e031f8fff8894b97d141b2.tar.gz linux-4a76411ea3f1da9032e031f8fff8894b97d141b2.zip | |
ARM: arm-soc: Merge branch 'next/clk' into next/pm
Merge together a couple of the smaller pm/clock branches into one.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions