Greg Kroah-Hartman bdc065666a Merge 4.9-rc3 into staging-next ... This resolves a merge issue with drivers/staging/iio/accel/sca3000_core.c and we want the fixes all in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2016-10-30 06:38:44 -04:00
..
ion	Merge 4.9-rc3 into staging-next	2016-10-30 06:38:44 -04:00
uapi	staging: android: ion_test: remove extra line per checkpatch.pl	2016-10-16 10:24:50 +02: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	dma-buf/sw_sync: de-stage SW_SYNC	2016-08-15 16:41:46 +02:00
lowmemorykiller.c	Staging: android: fixed permissions style issue	2016-09-27 13:08:05 +02:00
Makefile	dma-buf/sw_sync: de-stage SW_SYNC	2016-08-15 16:41:46 +02:00
TODO	staging/android: add TODO to de-stage android sync framework	2015-12-14 11:05:45 -08:00