From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 7 Jan 2016 21:11:36 +0000 (+0100)
Subject: Merge Rockchip pmdomain fix into next/defconfig
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b9e24d30f66bafae9a3949250740f69239126e9f;p=linux-beck.git

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
---

b9e24d30f66bafae9a3949250740f69239126e9f