diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-19 04:38:09 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-19 04:38:09 +0300 |
| commit | 2763f92f858f7c4c3198335c0542726eaed07ba3 (patch) | |
| tree | d5fe4eb838ae3fb0816fecb855d5595a35045334 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | b92ce305fcbc8d85d1732fecf17c823c760868bd (diff) | |
| parent | 69e05170ef0d0c00e1098dd6a625b44f39903a6a (diff) | |
| download | linux-2763f92f858f7c4c3198335c0542726eaed07ba3.tar.xz | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann:
"Two more bugfixes that came in during this week:
- a defconfig change to enable a vital driver used on some Qualcomm
based phones. This was already queued for 4.11, but the maintainer
asked to have it in 4.10 after all.
- a regression fix for the reset controller framework, this got
broken by a typo in the 4.10 merge window"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: multi_v7_defconfig: enable Qualcomm RPMCC
reset: fix shared reset triggered_count decrement on error
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions