diff options
| author | Olof Johansson <[email protected]> | 2014-05-20 05:27:05 +0000 |
|---|---|---|
| committer | Olof Johansson <[email protected]> | 2014-05-20 06:29:01 +0000 |
| commit | 5fe0163aea863b1a5f79173619fdfe9e9baad299 (patch) | |
| tree | c49a6f58a3d3d71825cf77477e1e2702d2ffe103 /tools/perf/scripts/python/sctop.py | |
| parent | Merge tag 'mvebu-soc-3.16' of git://git.infradead.org/linux-mvebu into next/soc (diff) | |
| parent | ARM: qcom: clean-up unneeded kconfig selects (diff) | |
| download | kernel-5fe0163aea863b1a5f79173619fdfe9e9baad299.tar.gz kernel-5fe0163aea863b1a5f79173619fdfe9e9baad299.zip | |
Merge branch 'cleanup/kconfig' into next/soc
Bring in the cleanup branch due to conflicts in new additions. Should really
have been the base before the other branch, but this way works too.
* cleanup/kconfig:
ARM: qcom: clean-up unneeded kconfig selects
ARM: bcm: clean-up unneeded kconfig selects
ARM: mvebu: clean-up unneeded kconfig selects
Signed-off-by: Olof Johansson <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/sctop.py')
0 files changed, 0 insertions, 0 deletions