Merge branch 'master' into crestline

diff --combined shared-core/i915_dma.c
index cd7d2b4,912fe0b..a2f1243
--- 1/shared-core/i915_dma.c
--- 2/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@@ -34,8 -34,7 +34,8 @@@
  #define IS_I965G(dev)  (dev->pci_device == 0x2972 || \
                        dev->pci_device == 0x2982 || \
                        dev->pci_device == 0x2992 || \
 -                      dev->pci_device == 0x29A2)
 +                      dev->pci_device == 0x29A2 || \
 +                      dev->pci_device == 0x2A02)
  
  
  /* Really want an OS-independent resettable timer.  Would like to have
@@@ -64,6 -63,7 +64,7 @@@ int i915_wait_ring(drm_device_t * dev, 
                        i = 0;
  
                last_head = ring->head;
+               DRM_UDELAY(1);
        }
  
        return DRM_ERR(EBUSY);