Merge remote branch 'origin/master' into modesetting-101

Conflicts:

	linux-core/Makefile.kernel
	shared-core/i915_drv.h

diff --cc linux-core/Makefile.kernel
index 6903ec6,7a477a1..a805859
--- 1/linux-core/Makefile.kernel
--- 2/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@@ -13,8 -13,8 +13,9 @@@ drm-objs    := drm_auth.o drm_bufs.o dr
                drm_sysfs.o drm_pci.o drm_agpsupport.o drm_scatter.o \
                drm_memory_debug.o ati_pcigart.o drm_sman.o \
                drm_hashtab.o drm_mm.o drm_object.o drm_compat.o \
 -              drm_fence.o drm_ttm.o drm_bo.o drm_bo_move.o drm_bo_lock.o \
 -              drm_regman.o drm_vm_nopage_compat.o
 +              drm_fence.o drm_ttm.o drm_bo.o drm_bo_move.o drm_crtc.o \
-               drm_edid.o drm_modes.o drm_bo_lock.o drm_regman.o
++              drm_edid.o drm_modes.o drm_bo_lock.o drm_regman.o \
++              drm_vm_nopage-compat.o
  tdfx-objs   := tdfx_drv.o
  r128-objs   := r128_drv.o r128_cce.o r128_state.o r128_irq.o
  mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o

diff --cc linux-core/drm_compat.c
index 8fa8ae0,3d082e7..2a76196
--- 1/linux-core/drm_compat.c
--- 2/linux-core/drm_compat.c
+++ b/linux-core/drm_compat.c
@@@ -806,4 -756,6 +806,5 @@@ void *kmap_atomic_prot_pfn(unsigned lon
  }
  
  EXPORT_SYMBOL(kmap_atomic_prot_pfn);
 -
  #endif
+ 

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

diff --cc linux-core/i915_drv.c
Simple merge

diff --cc shared-core/i915_drv.h
index bfb09c4,aad74b1..a7040f5
--- 1/shared-core/i915_drv.h
--- 2/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@@ -255,11 -237,11 +255,11 @@@ struct drm_i915_private 
        u8 saveSR[8];
        u8 saveGR[25];
        u8 saveAR_INDEX;
-       u8 saveAR[20];
+       u8 saveAR[21];
        u8 saveDACMASK;
        u8 saveDACDATA[256*3]; /* 256 3-byte colors */
-       u8 saveCR[36];
+       u8 saveCR[37];
 -} drm_i915_private_t;
 +};
  
  enum intel_chip_family {
        CHIP_I8XX = 0x01,