Greg Kroah-Hartman 407f3fd8fa Merge 3.2-rc5 into staging-next ... This resolves the conflict in the drivers/staging/iio/industrialio-core.c file due to two different changes made to resolve the same problem. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2011-12-09 19:01:27 -08:00
..
drivers	Merge 3.2-rc5 into staging-next	2011-12-09 19:01:27 -08:00
kcomedilib
comedi.h	staging: comedi: fixed a declaration coding style issue	2011-06-28 13:23:56 -07:00
comedi_compat32.c
comedi_compat32.h
comedi_fops.c	Merge 3.2-rc5 into staging-next	2011-12-09 19:01:27 -08:00
comedi_fops.h
comedidev.h	staging: comedi: remove COMEDI_DEVICE_CREATE macro, expand all callers	2011-07-06 08:22:49 -07:00
comedilib.h
drivers.c	Staging: comedi: drivers.c: fix PAGE_KERNEL_NOCACHE issue	2011-06-09 12:13:53 -07:00
internal.h
Kconfig	staging: comedi: new driver usbduxsigma	2011-08-23 12:00:45 -07:00
Makefile
proc.c
range.c
TODO