Linus Torvalds f98c2135f8 Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux ... Pull drm fixes from Dave Airlie: "Just a couple of dma-buf related fixes and some amdgpu fixes, along with a regression fix for radeon off but default feature, but makes my 30" monitor happy again" * 'drm-next' of git://people.freedesktop.org/~airlied/linux: drm/radeon/mst: cleanup code indentation drm/radeon/mst: fix regression in lane/link handling. drm/amdgpu: add invalidate_page callback for userptrs drm/amdgpu: Revert "remove the userptr rmn->lock" drm/amdgpu: clean up path handling for powerplay drm/amd/powerplay: fix memory leak of tdp_table dma-buf/fence: fix fence_is_later v2 dma-buf: Update docs for SYNC ioctl drm: remove excess description dma-buf, drm, ion: Propagate error code from dma_buf_start_cpu_access() drm/atmel-hlcdc: use helper to get crtc state drm/atomic: use helper to get crtc state		2016-03-25 08:48:31 -07:00
..
ion	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2016-03-25 08:48:31 -07:00
trace	staging/android: remove SYNC_WAIT ioctl	2016-02-07 17:34:58 -08:00
uapi	staging/android: remove len field from struct sync_fence_info	2016-02-07 17:34:58 -08:00
ashmem.c	Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-20 19:08:56 -07:00
ashmem.h
Kconfig	staging/android: move SW_SYNC_USER to a debugfs file	2016-02-07 17:34:58 -08:00
lowmemorykiller.c	staging: lowmemorykiller: fix 2 checks that checkpatch complained	2016-03-11 22:09:09 -08:00
Makefile	staging: Remove logger and alarm-dev from android Makefile	2015-01-28 11:32:39 -08:00
sw_sync.c	staging/android: remove driver_data from struct sync_fence_info	2016-02-07 17:34:58 -08:00
sw_sync.h	staging/android: remove struct sync_pt	2016-02-07 17:34:58 -08:00
sync_debug.c	drivers/staging/android: don't use modular references in sync_debug.c	2016-02-14 16:35:00 -08:00
sync.c	staging: android: Remove unneeded else following a return	2016-02-20 15:24:51 -08:00
sync.h	staging/android: remove driver_data from struct sync_fence_info	2016-02-07 17:34:58 -08:00
timed_gpio.c	staging: android: Use devm_kcalloc instead of devm_kzalloc	2016-03-11 22:09:09 -08:00
timed_gpio.h
timed_output.c	drivers/staging: make android timed_output.c explicitly non-modular	2015-10-12 21:12:17 -07:00
timed_output.h
TODO	staging/android: add TODO to de-stage android sync framework	2015-12-14 11:05:45 -08:00