diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 13:10:00 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 13:10:00 -0800 |
| commit | 8907dbaa363de87e5c6f48070e3d8b639477d5ba (patch) | |
| tree | 8c3e0245a7bd10535e5fab6d2da99de6824f5851 /tools/perf/scripts/python | |
| parent | Merge tag 'v4.5-rockchip-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | ARM: use "depends on" for SoC configs instead of "if" after prompt (diff) | |
| download | linux-8907dbaa363de87e5c6f48070e3d8b639477d5ba.tar.gz linux-8907dbaa363de87e5c6f48070e3d8b639477d5ba.zip | |
Merge branch 'treewide/cleanup' into next/soc
Merge in cleanup to avoid internal conflicts with newly added code.
* treewide/cleanup:
ARM: use "depends on" for SoC configs instead of "if" after prompt
ARM/clocksource: use automatic DT probing for ux500 PRCMU
ARM: use const and __initconst for smp_operations
ARM: hisi: do not export smp_operations structures
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions