Greg Kroah-Hartman 949c3676cd Staging: Merge branch 'staging-next' into 2.6.38-rc3 ...

This was done to resolve conflicts in the following files due
to patches in Linus's tree and in the staging-next tree:
	drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
	drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c

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

2011-02-02 13:35:58 -08:00

..

drivers

Staging: Merge branch 'staging-next' into 2.6.38-rc3

2011-02-02 13:35:58 -08:00

kcomedilib

…

comedi_compat32.c

…

comedi_compat32.h

…

comedi_fops.c

staging: comedi: Make INSN_BITS behavior consistent across drivers

2011-01-21 12:35:14 -08:00

comedi_fops.h

…

comedi.h

…

comedidev.h

…

comedilib.h

…

drivers.c

…

internal.h

…

Kconfig

…

Makefile

…

proc.c

…

range.c

…

TODO

…