Greg Kroah-Hartman eb1574270a Merge 3.4-rc5 into driver-core-next ...

This was done to resolve a merge issue with the init/main.c file.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-05-02 14:33:37 -07:00

..

alarm-dev.c

staging: android-alarm: HACK: wakelock workaround

2012-02-10 10:06:19 -08:00

alarm.c

staging: android-alarm: Fixup minor pr_alarm warnings

2012-02-10 10:08:01 -08:00

android_alarm.h

staging: android-alarm: Support old drivers via preprocessor aliasing

2012-02-10 10:08:01 -08: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: fixed a space warning in binder.h

2011-12-22 13:33:57 -08:00

Kconfig

Merge 3.4-rc5 into driver-core-next

2012-05-02 14:33:37 -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

Remove "switch" class in drivers/staging/android/switch

2012-04-23 13:24:00 -07:00

persistent_ram.c

staging: android: fix mem leaks in __persistent_ram_init()

2012-04-12 14:34:32 -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_gpio: Properly discard invalid timeout values.

2011-11-30 20:51:36 +09: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