Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree ...

This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2010-10-28 09:44:56 -07:00

..

camera

Merge 'staging-next' to Linus's tree

2010-10-28 09:44:56 -07:00

include

Staging: dream: add missing include files

2010-03-03 16:42:26 -08:00

qdsp5

Merge 'staging-next' to Linus's tree

2010-10-28 09:44:56 -07:00

generic_gpio.c

Staging: dream: add gpio and pmem support

2009-12-11 12:23:21 -08:00

gpio_axis.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

gpio_event.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

gpio_input.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

gpio_matrix.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

gpio_output.c

Staging: dream: add support for input on GPIO pins

2009-09-15 12:02:05 -07:00

Kconfig

staging: dream: smd: remove all smd related code

2010-05-14 13:21:30 -07:00

Makefile

Staging: dream: Makefile: cleaned up Makefile cflag lines

2010-10-05 11:56:39 -07:00

pmem.c

Merge 'staging-next' to Linus's tree

2010-10-28 09:44:56 -07:00

synaptics_i2c_rmi.c

i2c: Remove all i2c_set_clientdata(client, NULL) in drivers

2010-06-03 11:33:58 +02:00

synaptics_i2c_rmi.h

Staging: HTC Dream: touchscreen driver for staging

2009-09-15 12:02:04 -07:00

TODO

Staging: dream: remove last bits of earlysuspend support

2010-05-11 11:35:37 -07:00