linux/drivers/staging/android
Greg Kroah-Hartman d210267741 Merge 3.4-rc5 into staging-next
This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-02 11:48:07 -07:00
..
switch staging: android: switch: minor code formatting cleanups 2011-12-16 13:41:37 -08:00
alarm-dev.c staging: android-alarm: Switch from wakelocks to wakeup sources 2012-04-24 11:01:45 -07:00
android_alarm.h android-alarm: Remove unused android alarm in-kernel interfaces 2012-04-20 15:06:25 -07:00
ashmem.c drivers/staging/android/ashmem.c: Cleanups 2012-02-08 16:47:51 -08:00
ashmem.h ashmem: Anonymous shared memory subsystem 2011-12-21 13:38:28 -08:00
binder.c Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-03-29 18:12:23 -07:00
binder.h staging: android: binder: fix sparse warnings 2012-04-24 11:01:46 -07:00
Kconfig Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
logger.c staging: logger: hold mutex while removing reader 2012-02-24 12:03:14 -08:00
logger.h android: logger: Add new system log for framework/system log messages 2011-11-30 20:40:06 +09:00
lowmemorykiller.c android, lowmemorykiller: remove task handoff notifier 2012-04-09 20:48:44 -07:00
Makefile android-alarm: Remove unused android alarm in-kernel interfaces 2012-04-20 15:06:25 -07:00
persistent_ram.c Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
persistent_ram.h staging: android: persistent_ram: handle reserving and mapping memory 2012-03-08 09:36:08 -08:00
ram_console.c Staging: android: ram_console.c: 2012-03-15 16:38:14 -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: timed_gpio: Fix resource leak in timed_gpio_probe error paths 2012-04-10 09:48:29 -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: timed_output : disable the timed output device when the device is unregistered 2012-04-29 21:36:35 -04:00
timed_output.h Revert "Staging: android: delete android drivers" 2011-11-30 20:18:14 +09:00
TODO drivers:staging:android Typos: fix some comments that have typos in them. 2012-02-08 16:47:50 -08:00