diff options
| author | Daniel Vetter | 2014-11-19 18:14:57 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-11-19 18:17:38 +0100 |
| commit | 54499b2a926964b6b671fd03dcdc83c444b8f467 (patch) | |
| tree | ba57cd39218554850e4b920747b9e71f1f9842ee /fs/pnode.c | |
| parent | drm/i915: disable rps irqs earlier during suspend/unload (diff) | |
| parent | drm/i915: Kick fbdev before vgacon (diff) | |
| download | kernel-qcow2-linux-54499b2a926964b6b671fd03dcdc83c444b8f467.tar.gz kernel-qcow2-linux-54499b2a926964b6b671fd03dcdc83c444b8f467.tar.xz kernel-qcow2-linux-54499b2a926964b6b671fd03dcdc83c444b8f467.zip | |
Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued
So with all the code movement and extraction in intel_pm.c in -next
git is hopelessly confused with
commit 2208d655a91f9879bd9a39ff9df05dd668b3512c
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri Nov 14 09:25:29 2014 +0100
drm/i915: drop WaSetupGtModeTdRowDispatch:snb
from -fixes. Worse even small changes in -next move around the
conflict context so rerere is equally useless. Let's just backmerge
and be done with it.
Conflicts:
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c
Except for git getting lost no tricky conflicts really.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'fs/pnode.c')
0 files changed, 0 insertions, 0 deletions