diff options
author | 2016-07-07 15:54:54 +0200 | |
---|---|---|
committer | 2016-07-07 15:54:54 +0200 | |
commit | fc7c0be08448be0445c310b9a2ece48d85c08c7b (patch) | |
tree | 3474ad8c380ffd11a1f9d54fe075789d79edbab2 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'mvebu-arm64-4.8-1' of git://git.infradead.org/linux-mvebu into next/arm64 (diff) | |
parent | Merge tag 'bcm2835-arm64-next-2016-07-03' into soc-arm64/next (diff) | |
download | wireguard-linux-fc7c0be08448be0445c310b9a2ece48d85c08c7b.tar.xz wireguard-linux-fc7c0be08448be0445c310b9a2ece48d85c08c7b.zip |
Merge tag 'arm-soc/for-4.8/soc-arm64-part2' of http://github.com/Broadcom/stblinux into next/arm64
Merge "Broadcom ARM64-based SoC changes for 4.8 second part" from Florian Fainelli:
- Eric updates the bcm2836 interrupt controller driver not to rely on ARM/Linux specific functions
in preparation for using it on ARM64
- Eric also adds a Kconfig entry for the BCM2835 Raspberry Pi family in the ARM64 Kconfig.platforms
file
- Eric cherry picked a patch from Alexander Graf with Acks from ARM64 maintainers to support different
DMA and bus offsets, required for the Raspberry Pi 3 SoC
* tag 'arm-soc/for-4.8/soc-arm64-part2' of http://github.com/Broadcom/stblinux:
arm64: Add platform selection for BCM2835.
arm64: Allow for different DMA and CPU bus offsets
irqchip: bcm2835: Avoid arch/arm-specific handle_IRQ
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions