From: Dave Airlie <airlied@redhat.com>
Date: Tue, 8 Jul 2014 01:08:31 +0000 (+1000)
Subject: Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~125^2~87
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f71c5d9dd22f4d6b771cdb591050c84946a3e356;p=pandora-kernel.git

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
---

f71c5d9dd22f4d6b771cdb591050c84946a3e356
Reading git-diff-tree failed