Greg Kroah-Hartman 6a2a2cdd57 Merge 3.6-rc6 into staging-next ... This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-09-16 17:17:25 -07:00
..
Kconfig	staging/android: Remove ram_console driver	2012-06-13 17:03:09 -07:00
Makefile	staging/android: Remove ram_console driver	2012-06-13 17:03:09 -07:00
TODO	drivers:staging:android Typos: fix some comments that have typos in them.	2012-02-08 16:47:50 -08:00
alarm-dev.c	Staging: android: Alarm driver cleanups	2012-09-04 14:23:33 -07:00
android_alarm.h	Staging: Android alarm: IOCTL command encoding fix	2012-09-04 14:18:43 -07:00
ashmem.c	staging: android: ashmem: Fix comment/license formatting	2012-08-13 19:04:25 -07:00
ashmem.h	ashmem: Anonymous shared memory subsystem	2011-12-21 13:38:28 -08:00
binder.c	Staging: android: binder: Remove an inconsequential conditional macro	2012-08-17 09:46:52 -07:00
binder.h	staging: android: binder: fix sparse warnings	2012-04-24 11:01:46 -07:00
logger.c	staging: android: logger: Finish documentation of two structs	2012-08-13 19:04:25 -07:00
logger.h	staging: android: logger.h: Complete documentation of logger_entry	2012-08-13 19:04:25 -07:00
lowmemorykiller.c	android, lowmemorykiller: remove task handoff notifier	2012-04-09 20:48:44 -07:00
ram_console.h	staging: android: ram_console: pass in a boot info string	2011-11-30 21:23:37 +09:00
timed_gpio.c	staging/android: use module_platform_driver	2012-08-13 19:04:25 -07:00
timed_gpio.h	Staging: android: timed_gpio: Removed spaces before tabs	2012-02-29 15:52:52 -08:00
timed_output.c	staging: Android: Fix some checkpatch warnings	2012-06-12 11:20:17 -07:00
timed_output.h	Revert "Staging: android: delete android drivers"	2011-11-30 20:18:14 +09:00