diff options
author | 2016-04-13 13:02:06 -0700 | |
---|---|---|
committer | 2016-04-13 13:02:06 -0700 | |
commit | 90de6800c240dfe089e254116a7c055e70b709fd (patch) | |
tree | 7ceca78ebcc056291a92fe3a8be010a2dcf5fc63 /tools/perf/scripts/python/stackcollapse.py | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu (diff) | |
parent | sh: fix function signature of cpu_coregroup_mask to match pointer type (diff) | |
download | linux-dev-90de6800c240dfe089e254116a7c055e70b709fd.tar.xz linux-dev-90de6800c240dfe089e254116a7c055e70b709fd.zip |
Merge tag 'sh-fixes-4.6-rc1' of git://git.libc.org/linux-sh
Pull arch/sh fixes from Rich Felker:
"Fixes for two arch/sh build regressions that appeared in 4.6-rc1, one
introduced by me, and one caused by changes elsewhere"
* tag 'sh-fixes-4.6-rc1' of git://git.libc.org/linux-sh:
sh: fix function signature of cpu_coregroup_mask to match pointer type
sh: fix smp-shx3 build regression from removal of arch localtimer
Diffstat (limited to 'tools/perf/scripts/python/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions