diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-02-07 17:28:07 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-02-07 17:28:07 +0100 |
commit | 713c7dce1476326005375b4b714c1735d75b2965 (patch) | |
tree | e9bf07c5d0a8211048fdedc63bf35159f4a5079a /MAINTAINERS | |
parent | cbd3dcf3b865b961a9c10ff16e42908832cee63f (diff) | |
parent | 4f3a468666f78625142529434a51edf13c3acfed (diff) | |
parent | d2aff02f92598f8361f488424cdf1053edf3081d (diff) | |
parent | be07af29008e732257083013e82948d328b5878b (diff) |
Merge branches 'next/defconfig', 'next/drivers' and 'next/soc' into for-next
* next/defconfig:
ARM: sunxi: Add CONFIG_THERMAL_OF
* next/drivers:
soc: samsung: pmu: Add register defines for pad retention control
reset: make zx2967 explicitly non-modular
reset: core: fix reset_control_put
soc: samsung: pm_domains: Read domain name from the new label property
soc: samsung: pm_domains: Remove message about failed memory allocation
soc: samsung: pm_domains: Remove unused name field
soc: samsung: pm_domains: Use full names in subdomains registration log
* next/soc:
ARM: ep93xx: Disable TS-72xx watchdog before uncompressing
ARM: ux500: cut some platform data
MAINTAINERS: Update for the current location of the bcm2835 tree.
arm: mvebu: support for SMP on 98DX3336 SoC
arm: sunxi: add support for V3s SoC
ARM: sunxi: add support for H2+ SoC