diff options
author | 2018-12-03 13:09:38 -0800 | |
---|---|---|
committer | 2018-12-03 13:09:38 -0800 | |
commit | ac21e9af5a5cc7fe4c843ddf5bfefc9f71aa049b (patch) | |
tree | 2855853d40d788a3a3880a5259338cf28cfa693b /tools/perf/scripts/python | |
parent | Merge tag 'omap-for-v4.21/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc (diff) | |
parent | Merge tag 'tags/bcm2835-soc-next-2018-11-27' into soc/next (diff) | |
download | linux-dev-ac21e9af5a5cc7fe4c843ddf5bfefc9f71aa049b.tar.xz linux-dev-ac21e9af5a5cc7fe4c843ddf5bfefc9f71aa049b.zip |
Merge tag 'arm-soc/for-4.21/soc' of https://github.com/Broadcom/stblinux into next/soc
This pull request contains Broadcom ARM-based SoCs machine files updates
for 4.21, please pull the following:
- Stefan switches relevant BCM283x files under arch/arm/mach-bcm to the
SPDX license identifiers
- Justin adds an entry in the Broadcom STB debug LL stub for 7255
- Florian enables reset controller support for BCM63xx SoCs
* tag 'arm-soc/for-4.21/soc' of https://github.com/Broadcom/stblinux:
ARM: mach-bcm: Switch bcm2835 and platsmp to SPDX identifier
ARM: BCM63XX: Enable reset controller support
ARM: brcmstb: Add entry for 7255
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions