Greg Kroah-Hartman 829455bb0e Merge 3.10-rc3 into staging-next ... We want the changes here, and we resolve the merge conflict that was happening in the nvec_kbd.c file. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-05-27 10:54:33 +09:00
..
trace	staging: sync: Add tracepoint support	2013-03-04 17:46:55 +08:00
alarm-dev.c	staging: alarm-dev: Implement compat_ioctl support	2013-01-18 12:37:11 -08:00
android_alarm.h	staging: alarm-dev: Implement compat_ioctl support	2013-01-18 12:37:11 -08:00
ashmem.c	staging: android: Fixed line over 80 char	2013-05-13 05:49:31 -07:00
ashmem.h	staging: android: ashmem: Add support for 32bit ashmem calls in a 64bit kernel	2013-03-06 08:49:43 +08:00
binder_trace.h	Staging: android: binder: Add some tracepoints	2012-10-22 13:04:29 -07:00
binder.c	drivers: android: binder: Use __func__ in debug messages	2013-03-25 10:52:48 -07:00
binder.h	staging: android: binder: replace IOCTL types with user-exportable types	2013-04-11 08:51:51 -07:00
Kconfig	Removal of GENERIC_GPIO for v3.10	2013-05-09 09:59:16 -07:00
logger.c	staging: android: logger: use kuid_t instead of uid_t	2013-05-16 15:37:51 -07:00
logger.h	staging: android: logger: use kuid_t instead of uid_t	2013-05-16 15:37:51 -07:00
lowmemorykiller.c	staging: android: lowmemorykiller: well-marked debug print	2013-03-25 11:02:55 -07:00
Makefile	staging: sw_sync: Add cpu based sync driver	2013-03-04 17:40:08 +08:00
ram_console.h
sw_sync.c	staging: Fix lines over 80 chars in android sw_sync	2013-05-20 10:43:10 -07:00
sw_sync.h	staging: sw_sync: Add cpu based sync driver	2013-03-04 17:40:08 +08:00
sync.c	staging: android: Replace seq_printf with seq_puts	2013-05-12 08:36:02 -07:00
sync.h	staging: sync: Refactor sync debug printing	2013-03-04 17:46:55 +08:00
timed_gpio.c	staging/android: use module_platform_driver	2012-08-13 19:04:25 -07:00
timed_gpio.h
timed_output.c	staging: Android: Fix some checkpatch warnings	2012-06-12 11:20:17 -07:00
timed_output.h
TODO