Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorDave Airlie <airlied@redhat.com>
Mon, 27 Aug 2012 06:22:20 +0000 (16:22 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 27 Aug 2012 06:22:20 +0000 (16:22 +1000)
commit93bb70e0c00f1be4cc857e4d8375c44058cce71e
tree7b6a11844e00b3f4bf8281c7a799e61494220819
parent6f314ebbaa2667d67a7206ba78f28e46cf47eda5
parentc182ae42cc3611f7b3fa803c0bcab6e5d29bea63
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux into drm-next

There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_modes.c
drivers/gpu/drm/Kconfig
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_crt.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_modes.c
drivers/gpu/drm/i915/intel_pm.c
include/drm/drm_crtc.h