Greg Kroah-Hartman cb1f6268ac Merge 3.7-rc3 into staging-next ...

This resolves the conflict with:
	drivers/staging/comedi/drivers/amplc_dio200.c
and syncs up the changes that happened in the staging directory for
3.7-rc3.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-10-29 08:37:12 -07: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

mm: kill vma flag VM_CAN_NONLINEAR

2012-10-09 16:22:17 +09:00

ashmem.h

ashmem: Anonymous shared memory subsystem

2011-12-21 13:38:28 -08:00

binder_trace.h

Staging: android: binder: Add some tracepoints

2012-10-22 13:04:29 -07:00

binder.c

Merge 3.7-rc3 into staging-next

2012-10-29 08:37:12 -07:00

binder.h

staging: android: binder: fix sparse warnings

2012-04-24 11:01:46 -07:00

Kconfig

staging/android: Remove ram_console driver

2012-06-13 17:03:09 -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

Makefile

Staging: android: binder: Add some tracepoints

2012-10-22 13:04:29 -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

…

TODO

drivers:staging:android Typos: fix some comments that have typos in them.

2012-02-08 16:47:50 -08:00