Greg Kroah-Hartman 17cb3be61b Merge branch 'staging-linus' into staging-next ... This is to get the comedi fixes, and resolve the issue in comdi_test.c and comedi_fops.c that were caused by changes in both branches. It also allows the fwserial driver changes to be applied, as they required the fixes that are in staging-linus. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-01-07 15:17:52 -08:00
..
drivers	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
kcomedilib	staging: comedi: use comedi_dev_from_minor()	2013-01-07 14:25:46 -08:00
comedi_compat32.c	staging: comedi: Makefile: conditionally compile multi-file core module	2013-01-07 14:51:11 -08:00
comedi_compat32.h	staging: comedi: shrink comedi_compat32.h	2012-06-20 12:57:43 -07:00
comedi_fops.c	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
comedi_internal.h	staging: comedi: remove comedi_fops.h	2012-06-20 12:56:55 -07:00
comedi.h	staging: comedi: define operations for INSN_CONFIG_DIGITAL_TRIG	2012-11-14 16:25:08 -08:00
comedidev.h	Staging: comedi: comedidev.h: fixed a camel case	2013-01-07 14:34:49 -08:00
comedilib.h
drivers.c	staging: comedi: store the 'index' for each subdevice	2013-01-07 14:28:19 -08:00
Kconfig	staging: comedi: Kconfig: COMEDI_NI_AT_A2150 should select COMEDI_FC	2013-01-07 14:48:24 -08:00
Makefile	staging: comedi: Makefile: conditionally compile multi-file core module	2013-01-07 14:51:11 -08:00
proc.c	staging: comedi: Makefile: conditionally compile multi-file core module	2013-01-07 14:51:11 -08:00
range.c	staging: comedi: range: remove subdevice pointer math	2012-09-05 20:06:32 -07:00
TODO