diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 21:11:13 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 21:11:13 +0200 |
| commit | ccb0f688ea60b0b0128f3796f58879954c260f2f (patch) | |
| tree | 0877b4fdafd8b6cd46f41f148f7e85a7d27b9540 /tools/perf/util/scripting-engines/trace-event-perl.c | |
| parent | dbb2bc9118da94ba261278068af300ad3e71efc8 (diff) | |
| parent | b72541b33825807d247b6455364db9cd3ca5d6ad (diff) | |
Merge tag 'arm-soc/for-4.7/defconfig' of http://github.com/Broadcom/stblinux into next/defconfig
Merge "This pull request contains defconfig changes for Broadcom ARM-based SoCs"
from Florian Fainelli:
- Eric enables more BCM2835 peripherals in multi_v7_defconfig: watchdog, I2S,
switches from the sdhci-bcm2835 to the sdhci-iproc driver, DWC2 USB controller
- Eric also enables more BCM2835 peripherals in bcm2835_defconfig: VC4, NFS root
Power Management support, switching sdhci-bcm2835 for sdhci-iproc
* tag 'arm-soc/for-4.7/defconfig' of http://github.com/Broadcom/stblinux:
ARM: bcm2835: Enable NFS root support.
ARM: bcm2835: Enable the VC4 graphics driver in the defconfig
ARM: bcm2835: Enable CONFIG_PM.
ARM: bcm2835: Switch BCM2835 to sdhci-iproc.c for MMC
ARM: multi_v7_defconfig: Build in DWC2 USB support
ARM: multi_v7_defconfig: Switch BCM2835 to sdhci-iproc.c for MMC
ARM: multi_v7_defconfig: Add more BCM2835 support
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-perl.c')
0 files changed, 0 insertions, 0 deletions