Merge remote-tracking branch 'drm/drm-next'

Merge remote-tracking branch 'drm/drm-next'

Conflicts:
	drivers/gpu/drm/gma500/psb_drv.h
	drivers/gpu/drm/i915/intel_dp.c
	drivers/gpu/drm/i915/intel_drv.h
	drivers/gpu/drm/nouveau/core/core/mm.c
	drivers/gpu/drm/nouveau/core/engine/graph/ctxnv40.c
	drivers/gpu/drm/nouveau/core/engine/graph/ctxnv50.c
	drivers/gpu/drm/nouveau/core/include/subdev/vm.h
	drivers/gpu/drm/nouveau/core/subdev/clock/pllnva3.c
	drivers/gpu/drm/nouveau/core/subdev/devinit/base.c
	drivers/gpu/drm/nouveau/core/subdev/devinit/nv1a.c
	drivers/gpu/drm/nouveau/core/subdev/vm/base.c
	drivers/gpu/drm/nouveau/core/subdev/vm/nv50.c
	drivers/gpu/drm/nouveau/core/subdev/vm/nvc0.c
	drivers/gpu/drm/nouveau/nouveau_abi16.c
	drivers/gpu/drm/nouveau/nouveau_acpi.c
	drivers/gpu/drm/nouveau/nouveau_backlight.c
	drivers/gpu/drm/nouveau/nouveau_bios.c
	drivers/gpu/drm/nouveau/nouveau_bo.c
	drivers/gpu/drm/nouveau/nouveau_calc.c
	drivers/gpu/drm/nouveau/nouveau_channel.c
	drivers/gpu/drm/nouveau/nouveau_connector.h
	drivers/gpu/drm/nouveau/nouveau_debugfs.c
	drivers/gpu/drm/nouveau/nouveau_display.c
	drivers/gpu/drm/nouveau/nouveau_dma.c
	drivers/gpu/drm/nouveau/nouveau_dp.c
	drivers/gpu/drm/nouveau/nouveau_drv.c
	drivers/gpu/drm/nouveau/nouveau_drv.h
	drivers/gpu/drm/nouveau/nouveau_encoder.h
	drivers/gpu/drm/nouveau/nouveau_fbcon.c
	drivers/gpu/drm/nouveau/nouveau_gem.c
	drivers/gpu/drm/nouveau/nouveau_gpio.c
	drivers/gpu/drm/nouveau/nouveau_gpuobj.c
	drivers/gpu/drm/nouveau/nouveau_hdmi.c
	drivers/gpu/drm/nouveau/nouveau_hw.c
	drivers/gpu/drm/nouveau/nouveau_hw.h
	drivers/gpu/drm/nouveau/nouveau_i2c.c
	drivers/gpu/drm/nouveau/nouveau_irq.c
	drivers/gpu/drm/nouveau/nouveau_mem.c
	drivers/gpu/drm/nouveau/nouveau_mxm.c
	drivers/gpu/drm/nouveau/nouveau_notifier.c
	drivers/gpu/drm/nouveau/nouveau_pm.c
	drivers/gpu/drm/nouveau/nouveau_prime.c
	drivers/gpu/drm/nouveau/nouveau_ramht.c
	drivers/gpu/drm/nouveau/nouveau_sgdma.c
	drivers/gpu/drm/nouveau/nouveau_state.c
	drivers/gpu/drm/nouveau/nouveau_temp.c
	drivers/gpu/drm/nouveau/nouveau_ttm.c
	drivers/gpu/drm/nouveau/nv04_cursor.c
	drivers/gpu/drm/nouveau/nv04_fb.c
	drivers/gpu/drm/nouveau/nv04_fbcon.c
	drivers/gpu/drm/nouveau/nv04_fence.c
	drivers/gpu/drm/nouveau/nv04_fifo.c
	drivers/gpu/drm/nouveau/nv04_graph.c
	drivers/gpu/drm/nouveau/nv04_instmem.c
	drivers/gpu/drm/nouveau/nv04_mc.c
	drivers/gpu/drm/nouveau/nv04_pm.c
	drivers/gpu/drm/nouveau/nv04_software.c
	drivers/gpu/drm/nouveau/nv04_timer.c
	drivers/gpu/drm/nouveau/nv04_tv.c
	drivers/gpu/drm/nouveau/nv10_fb.c
	drivers/gpu/drm/nouveau/nv10_fence.c
	drivers/gpu/drm/nouveau/nv10_fifo.c
	drivers/gpu/drm/nouveau/nv10_gpio.c
	drivers/gpu/drm/nouveau/nv10_graph.c
	drivers/gpu/drm/nouveau/nv17_fifo.c
	drivers/gpu/drm/nouveau/nv17_tv.c
	drivers/gpu/drm/nouveau/nv17_tv_modes.c
	drivers/gpu/drm/nouveau/nv20_fb.c
	drivers/gpu/drm/nouveau/nv20_graph.c
	drivers/gpu/drm/nouveau/nv30_fb.c
	drivers/gpu/drm/nouveau/nv31_mpeg.c
	drivers/gpu/drm/nouveau/nv40_fb.c
	drivers/gpu/drm/nouveau/nv40_fifo.c
	drivers/gpu/drm/nouveau/nv40_graph.c
	drivers/gpu/drm/nouveau/nv40_mc.c
	drivers/gpu/drm/nouveau/nv40_pm.c
	drivers/gpu/drm/nouveau/nv50_display.c
	drivers/gpu/drm/nouveau/nv50_display.h
	drivers/gpu/drm/nouveau/nv50_fb.c
	drivers/gpu/drm/nouveau/nv50_fbcon.c
	drivers/gpu/drm/nouveau/nv50_fifo.c
	drivers/gpu/drm/nouveau/nv50_gpio.c
	drivers/gpu/drm/nouveau/nv50_graph.c
	drivers/gpu/drm/nouveau/nv50_instmem.c
	drivers/gpu/drm/nouveau/nv50_mc.c
	drivers/gpu/drm/nouveau/nv50_mpeg.c
	drivers/gpu/drm/nouveau/nv50_pm.c
	drivers/gpu/drm/nouveau/nv50_software.c
	drivers/gpu/drm/nouveau/nv50_vram.c
	drivers/gpu/drm/nouveau/nv84_bsp.c
	drivers/gpu/drm/nouveau/nv84_crypt.c
	drivers/gpu/drm/nouveau/nv84_fence.c
	drivers/gpu/drm/nouveau/nv84_fifo.c
	drivers/gpu/drm/nouveau/nv84_vp.c
	drivers/gpu/drm/nouveau/nv98_crypt.c
	drivers/gpu/drm/nouveau/nva3_copy.c
	drivers/gpu/drm/nouveau/nva3_pm.c
	drivers/gpu/drm/nouveau/nvc0_copy.c
	drivers/gpu/drm/nouveau/nvc0_fb.c
	drivers/gpu/drm/nouveau/nvc0_fbcon.c
	drivers/gpu/drm/nouveau/nvc0_fence.c
	drivers/gpu/drm/nouveau/nvc0_fifo.c
	drivers/gpu/drm/nouveau/nvc0_graph.c
	drivers/gpu/drm/nouveau/nvc0_grctx.c
	drivers/gpu/drm/nouveau/nvc0_instmem.c
	drivers/gpu/drm/nouveau/nvc0_pm.c
	drivers/gpu/drm/nouveau/nvc0_software.c
	drivers/gpu/drm/nouveau/nvc0_vram.c
	drivers/gpu/drm/nouveau/nve0_fifo.c
	drivers/gpu/drm/nouveau/nve0_graph.c
	drivers/gpu/drm/nouveau/nve0_grctx.c