From: Daniel Vetter Date: Thu, 16 Jan 2014 21:06:30 +0000 (+0100) Subject: Merge commit origin/master into drm-intel-next X-Git-Tag: v3.14-rc1~47^2~16^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d9d349d8788d30f3fc3bb39279c370f94d9dbec;p=pandora-kernel.git Merge commit origin/master into drm-intel-next Conflicts are getting out of hand, and now we have to shuffle even more in -next which was also shuffled in -fixes (the call for drm_mode_config_reset needs to move yet again). So do a proper backmerge. I wanted to wait with this for the 3.13 relaese, but alas let's just do this now. Conflicts: drivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/intel_ddi.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_pm.c Besides the conflict around the forcewake get/put (where we chaged the called function in -fixes and added a new parameter in -next) code all the current conflicts are of the adjacent lines changed type. Signed-off-by: Daniel Vetter --- 0d9d349d8788d30f3fc3bb39279c370f94d9dbec Reading git-diff-tree failed