]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 18 Mar 2014 09:17:02 +0000 (19:17 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 18 Mar 2014 09:17:02 +0000 (19:17 +1000)
This is the 3rd respin of the drm-anon patches. They allow module unloading, use
the pin_fs_* helpers recommended by Al and are rebased on top of drm-next. Note
that there are minor conflicts with the "drm-minor" branch.

* 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
  drm: init TTM dev_mapping in ttm_bo_device_init()
  drm: use anon-inode instead of relying on cdevs
  drm: add pseudo filesystem for shared inodes

1  2 
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/ttm/ttm_bo.c
include/drm/drmP.h

Simple merge
Simple merge
Simple merge
Simple merge