Dave Airlie f29135ee4e Merge v4.18-rc3 into drm-next ... Two requests have come in for a backmerge, and I've got some pull reqs on rc2, so this just makes sense. Signed-off-by: Dave Airlie <airlied@redhat.com>		2018-07-04 10:27:12 +10:00
..
ion	Merge v4.18-rc3 into drm-next	2018-07-04 10:27:12 +10:00
uapi	staging: android: ion: Fix license identifier comment format	2018-05-08 13:34:39 +02:00
Kconfig	staging: android: Kconfig; Remove excessive hyphens	2018-05-08 13:24:15 +02:00
Makefile	staging: Android: Add 'vsoc' driver for cuttlefish.	2018-04-23 14:51:37 +02:00
TODO	staging: Android: vsoc: Create wc kernel mapping for region shm.	2018-05-03 13:53:03 -07:00
ashmem.c	drivers:staging:android:ashmem: Changing return type from int to loff_t	2018-03-19 19:43:24 +01:00
ashmem.h	staging: android: Clean up license identifiers	2018-05-08 13:24:15 +02:00
vsoc.c	staging: android: vsoc: Fix ending '(' warnings in vsoc_probe_device	2018-05-08 13:24:16 +02:00