diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-11-27 16:05:30 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-27 16:05:30 +0100 |
commit | 321081f5f5ad40880d2a92dedd07052ea2a25516 (patch) | |
tree | e920c138ed83f3fc2aae43a074db6b88f09b89a9 /tools/perf/scripts/python/event_analyzing_sample.py | |
parent | d1940cbd4687ea517801ef5c861e8625450e7285 (diff) | |
parent | da1a7592132eb8f71056bd168fccbe2801c5d697 (diff) |
Merge branch 'sunxi/dt' into next/dt
This avoids a boot regression
* sunxi/dt:
Revert "ARM: dts: sunxi: unify APB1 clock"
Revert "ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks."
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