Merge branch 'origin'

diff --cc linux-core/drmP.h
Simple merge

diff --cc shared-core/i915_dma.c
Simple merge

diff --cc shared-core/i915_drv.h
Simple merge

diff --cc shared-core/i915_irq.c
index 40724fa,17cccac..698ecce
--- 1/shared-core/i915_irq.c
--- 2/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@@ -88,9 -87,10 +89,9 @@@ i915_dispatch_vsync_flip(struct drm_dev
   *
   * This function will be called with the HW lock held.
   */
- static void i915_vblank_tasklet(drm_device_t *dev)
+ static void i915_vblank_tasklet(struct drm_device *dev)
  {
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 -      unsigned long irqflags;
        struct list_head *list, *tmp, hits, *hit;
        int nhits, nrects, slice[2], upper[2], lower[2], i, num_pages;
        unsigned counter[2] = { atomic_read(&dev->vbl_received),