drm: update to i915 1.3.0
authorDave Airlie <airlied@starflyer.(none)>
Mon, 2 Jan 2006 09:14:23 +0000 (20:14 +1100)
committerDave Airlie <airlied@linux.ie>
Mon, 2 Jan 2006 09:14:23 +0000 (20:14 +1100)
Add support for vblank ioctls to i915 driver

From: Dave Airlie <airlied@linux.ie>
Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/char/drm/i915_dma.c
drivers/char/drm/i915_drm.h
drivers/char/drm/i915_drv.c
drivers/char/drm/i915_drv.h
drivers/char/drm/i915_irq.c
drivers/char/drm/i915_mem.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge