Merge tag 'drm-intel-next-fixes-2014-12-30' of git://anongit.freedesktop.org/drm...
authorDave Airlie <airlied@gmail.com>
Sun, 4 Jan 2015 07:41:00 +0000 (17:41 +1000)
committerDave Airlie <airlied@gmail.com>
Sun, 4 Jan 2015 07:41:00 +0000 (17:41 +1000)
commit379a2d31cb8d1eddf1970be95b871b4371be296a
tree034ac65ad43a28fc0c0a32e5cc6dedc9ea4616ca
parentd753856c9f9ae33a980192aa7b81d8b97d79dec2
parent5d77d9c5e177d2182df5d9fd61ba986facb64415
Merge tag 'drm-intel-next-fixes-2014-12-30' of git://anongit.freedesktop.org/drm-intel into linus

I've had these since before -rc1, but they missed my last pull
request. Real bug fixes and mostly cc: stable material.

* tag 'drm-intel-next-fixes-2014-12-30' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: add missing rpm ref to i915_gem_pwrite_ioctl
  Revert "drm/i915: Preserve VGACNTR bits from the BIOS"
  drm/i915: Don't call intel_prepare_page_flip() multiple times on gen2-4
  drm/i915: Kill check_power_well() calls
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_display.c