diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-01-07 22:11:36 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-01-07 22:11:36 +0100 |
| commit | b9e24d30f66bafae9a3949250740f69239126e9f (patch) | |
| tree | cd0f1eae69bcaa2d9622c265ddeb909b210aaf45 /arch/arm/configs | |
| parent | 954e953c279f387df7a821a524420b32429254a7 (diff) | |
| parent | d7b53fd9e37a4127077720f4fef10330e284107c (diff) | |
Merge Rockchip pmdomain fix into next/defconfig
Commit e330eb86ba ("ARM: multi_v7_defconfig: enable Rockchip io-domain
driver") turns on a driver that was broken on 4.4-rc3 and fixed in 4.4-rc4.
This backmerges in the bugfix from mainline to keep the defconfig branch
testable by itself.
* commit 'd7b53fd9e37a':
drm/rockchip: vop: Correct enabled clocks during setup
drm/i915: Don't override output type for DDI HDMI
drm/i915: Don't compare has_drrs strictly in pipe config
drm/i915: Mark uneven memory banks on gen4 desktop as unknown swizzling
Diffstat (limited to 'arch/arm/configs')
0 files changed, 0 insertions, 0 deletions