linux-next: manual merge of the mfd tree with the drm-intel tree