Greg Kroah-Hartman caf382fe31 Merge 3.17-rc5 into staging-next. ... This fixes a merge conflict in lustre, and we want the other fixes that went into 3.17-rc5 as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2014-09-14 19:33:47 -07:00
..
ion	staging: android: ion: Remove redundant return of void function	2014-08-16 12:23:23 -07:00
trace	android: convert sync to fence api, v6	2014-07-08 13:28:26 -07:00
uapi	staging: android: fix attribute as suggested by checkpatch	2014-08-17 09:50:44 -07:00
alarm-dev.c	staging: alarm-dev: Set the license to GPL	2014-06-20 08:28:01 -07:00
android_alarm.h	staging: android: Split uapi out of android_alarm.h	2014-02-18 11:03:28 -08:00
ashmem.c	staging: ashmem: Avoid deadlock between read and mmap calls	2014-02-07 09:03:16 -08:00
ashmem.h	staging: android: Split uapi out of ashmem.h	2014-02-18 11:03:28 -08:00
binder_trace.h	staging: binder: Support concurrent 32 bit and 64 bit processes.	2014-02-24 16:29:40 -08:00
binder.c	staging: binder: fix coding style issues	2014-09-08 13:29:01 -07:00
binder.h	staging: binder: Support concurrent 32 bit and 64 bit processes.	2014-02-24 16:29:40 -08:00
Kconfig	Staging driver patches for 3.17-rc1	2014-08-04 18:36:12 -07:00
logger.c	staging: android: fix a possible memory leak	2014-08-17 07:15:10 -07:00
logger.h
lowmemorykiller.c	staging: android: lowmemorykiller: neglect swap cached pages in other_file	2014-02-27 14:51:27 -08:00
Makefile	android: convert sync to fence api, v6	2014-07-08 13:28:26 -07:00
sw_sync.c	Staging: android: sw_sync.c: Fixed coding style issue.	2014-08-16 12:23:05 -07:00
sw_sync.h	staging: android: split uapi out of sync.h and sw_sync.h	2014-02-18 11:03:28 -08:00
sync_debug.c	staging: android: Cleanup style issues	2014-07-12 13:24:19 -07:00
sync.c	Merge 3.17-rc5 into staging-next.	2014-09-14 19:33:47 -07:00
sync.h	android: convert sync to fence api, v6	2014-07-08 13:28:26 -07:00
timed_gpio.c	Staging: android: timed_gpio.c: improved logic of gpio_get_time()	2014-08-01 14:40:30 -07:00
timed_gpio.h
timed_output.c	Staging: android: timed_output.c: use kstrtoint() instead of sscanf()	2014-07-30 17:17:02 -07:00
timed_output.h	staging: android: timed_output: fix a checkpatch warning	2014-02-11 12:27:30 -08:00
TODO