diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-05 11:19:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-05 11:19:40 -0700 |
| commit | 112eb07287d10bef6ec74e36f1ffd24f19bdd0a0 (patch) | |
| tree | e63ffa5c2a851b849dbcbd144226ad5fd10e949f /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Linux 4.12-rc4 (diff) | |
| parent | ARM: 8677/1: boot/compressed: fix decompressor header layout for v7-M (diff) | |
| download | linux-rng-112eb07287d10bef6ec74e36f1ffd24f19bdd0a0.tar.xz linux-rng-112eb07287d10bef6ec74e36f1ffd24f19bdd0a0.zip | |
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Three fixes this time around:
- Two fixes for noMMU, fixing the decompressor header layout, and
preventing a build error with some configurations.
- Fixing the hyp-stub updates that went in during the merge window
for platforms that use MCPM"
* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8677/1: boot/compressed: fix decompressor header layout for v7-M
ARM: 8676/1: NOMMU: provide pgprot_device() macro
ARM: 8675/1: MCPM: ensure not to enter __hyp_soft_restart from loopback and cpu_power_down
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions