Merge branch 'master' into crestline

Conflicts:

	shared-core/i915_dma.c

diff --cc shared-core/drm_pciids.txt
Simple merge

diff --cc shared-core/i915_dma.c
index 1a89514,60e3e94..63b2a3e
--- 1/shared-core/i915_dma.c
--- 2/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@@ -1,4 -1,4 +1,4 @@@
--/* i915_dma.c -- DMA support for the I915 -*- linux-c -*-
++/ i915_dma.c -- DMA support for the I915 -*- linux-c -*-
   */
  /*
   * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
@@@ -31,13 -31,12 +31,12 @@@
  #include "i915_drm.h"
  #include "i915_drv.h"
  
 -#define IS_I965G(dev)  (dev->pci_device == 0x2972 || \
 -                      dev->pci_device == 0x2982 || \
 -                      dev->pci_device == 0x2992 || \
 -                      dev->pci_device == 0x29A2)
 -
 +#define IS_I965G(dev)  (dev->pdev->device == 0x2972 || \
 +                      dev->pdev->device == 0x2982 || \
 +                      dev->pdev->device == 0x2992 || \
 +                      dev->pdev->device == 0x29A2 || \
 +                      dev->pdev->device == 0x2A02)
  
- 
  /* Really want an OS-independent resettable timer.  Would like to have
   * this loop run for (eg) 3 sec, but have the timer reset every time
   * the head pointer changes, so that EBUSY only happens if the ring