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
..
drivers	Merge 'staging-next' to Linus's tree	2010-10-28 09:44:56 -07:00
kcomedilib	Staging: comedi: kcomedilib: fix coding style issues in kcomedilib_main.c	2010-07-08 13:15:16 -07:00
comedi_compat32.c
comedi_compat32.h
comedi_fops.c	Merge 'staging-next' to Linus's tree	2010-10-28 09:44:56 -07:00
comedi_fops.h
comedi.h
comedidev.h
comedilib.h
drivers.c
internal.h
Kconfig
Makefile	Staging: comedi: Makefile: replace the use of <module>-objs with <module>-y	2010-10-08 07:23:52 -07:00
proc.c
range.c
TODO