Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next

* 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
  drm/omap: remove null test before kfree
  drm/bochs: replace ALIGN(PAGE_SIZE) by PAGE_ALIGN
  drm/ttm: recognize ARM arch in ioprot handler
  drm: enable render-nodes by default
  drm/ttm: remove declaration of ttm_tt_cache_flush
  drm/gem: remove misleading gfp parameter to get_pages()
  drm/omap: use __GFP_DMA32 for shmem-backed gem
  drm/i915: use shmem helpers if possible

Conflicts:
	drivers/gpu/drm/drm_stub.c

diff --cc drivers/gpu/drm/drm_stub.c
index f4148bf,07bf701..4e862b4
--- 1/drivers/gpu/drm/drm_stub.c
--- 2/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@@ -37,14 -37,15 +37,12 @@@
  unsigned int drm_debug = 0;   /* 1 to enable debug output */
  EXPORT_SYMBOL(drm_debug);
  
- unsigned int drm_rnodes = 0;  /* 1 to enable experimental render nodes API */
- 
  /* 1 to allow user space to request universal planes (experimental) */
  unsigned int drm_universal_planes = 0;
 -EXPORT_SYMBOL(drm_universal_planes);
  
  unsigned int drm_vblank_offdelay = 5000;    /* Default to 5000 msecs. */
 -EXPORT_SYMBOL(drm_vblank_offdelay);
  
  unsigned int drm_timestamp_precision = 20;  /* Default to 20 usecs. */
 -EXPORT_SYMBOL(drm_timestamp_precision);
  
  /*
   * Default to use monotonic timestamps for wait-for-vblank and page-flip

diff --cc drivers/gpu/drm/msm/msm_gem.c
Simple merge

diff --cc include/drm/drmP.h
Simple merge