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	Staging: comedi: kcomedilib: fix coding style issues in kcomedilib_main.c	2010-07-08 13:15:16 -07:00
comedi_compat32.c	Staging: comedi: range.c: properly mark up __user pointers	2010-05-11 11:36:03 -07:00
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	Staging: comedi: Fixed more long line lengths in comedi.h	2010-05-14 13:53:19 -07:00
comedidev.h	Staging: comedi: Remove COMEDI_PCI_INITCLEANUP macro	2010-06-17 13:48:12 -07:00
comedilib.h	Staging: comedi: kcomedilib: make it typesafe	2010-05-11 11:36:02 -07:00
drivers.c	Staging: comedi: Fix coding style issues in drivers.c	2010-12-09 16:39:06 -08:00
internal.h	Staging: comedi: drivers.c sparse cleanup	2010-05-11 11:36:03 -07:00
Kconfig	Staging: comedi: fixing ni_labpc to mite dependancy	2010-06-04 13:38:57 -07:00
Makefile	Staging: comedi: Makefile: replace the use of <module>-objs with <module>-y	2010-10-08 07:23:52 -07:00
proc.c	Staging: comedi: clean up sparse issues in proc.c	2010-05-11 11:36:03 -07:00
range.c	Staging: comedi: range.c: properly mark up __user pointers	2010-05-11 11:36:03 -07:00
TODO	Staging: comedi: Remove typedefs	2010-06-17 13:49:07 -07:00