Fix DRM mismerges.
authorMichal Srb <msrb@suse.com>
Fri, 19 Apr 2013 14:02:02 +0000 (16:02 +0200)
committerMichal Srb <msrb@suse.com>
Fri, 19 Apr 2013 14:02:02 +0000 (16:02 +0200)
commit3acd909c0eee540bc781fe3e9ef89c33aa0c3383
tree8918507e95880ccaeb2f11919e2082331917f20b
parent660a8a9509a522dced8a20510556efc86d6d5b79
Fix DRM mismerges.

- Refresh patches.drm/1822-drm-i915-kick-any-firmware-framebuffers-before-claiming-the-gtt.
- Refresh patches.drm/1874-drm-i915-agp-intel-gtt-prep-work-for-direct-setup.
- Refresh patches.drm/2271-merge-tag-v3-6-rc2-into-drm-intel-next.
- Refresh patches.drm/2328-drm-i915-add-workarounds-directly-to-gen6_render_ring_flush.
- Refresh patches.drm/3029-drm-i915-stop-using-agp-layer-for-gen6.

suse-commit: aa02d6b2868013baf608c3fd7a5812ac1999c69f
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_ringbuffer.c