Greg Kroah-Hartman c8d1a12692 Merge staging-next tree into Linus's latest version ... Conflicts: drivers/staging/arlan/arlan-main.c drivers/staging/comedi/drivers/cb_das16_cs.c drivers/staging/cx25821/cx25821-alsa.c drivers/staging/dt3155/dt3155_drv.c drivers/staging/hv/hv.c drivers/staging/netwave/netwave_cs.c drivers/staging/wavelan/wavelan.c drivers/staging/wavelan/wavelan_cs.c drivers/staging/wlags49_h2/wl_cs.c This required a bit of hand merging due to the conflicts that happened in the later .34-rc releases, as well as some staging driver changing coming in through other trees (v4l and pcmcia). Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2010-05-21 12:48:55 -07:00
..
drivers	Merge staging-next tree into Linus's latest version	2010-05-21 12:48:55 -07:00
kcomedilib	Staging: comedi: new Kconfig and Makefiles, drivers grouped by bustype.	2010-05-18 14:23:12 -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	Staging: comedi: remove check for HAVE_COMPAT_IOCTL	2009-12-11 12:23:01 -08:00
comedi_fops.c	Staging: comedi: Fix long line lengths in comedi_fops.c	2010-05-14 13:48:02 -07:00
comedi_fops.h	Staging: comedi: fix up remaining coding style issue in proc.c	2010-05-11 11:35:58 -07:00
comedi.h	Staging: comedi: Fixed more long line lengths in comedi.h	2010-05-14 13:53:19 -07:00
comedidev.h	Staging: comedi: Fixed long line length in comedidev.h	2010-05-11 11:36:18 -07:00
comedilib.h	Staging: comedi: kcomedilib: make it typesafe	2010-05-11 11:36:02 -07:00
drivers.c	Staging: comedi: Fixed printk call lengths and log levels	2010-05-11 11:36:18 -07:00
internal.h	Staging: comedi: drivers.c sparse cleanup	2010-05-11 11:36:03 -07:00
Kconfig	Staging: comedi: Kconfig dependancy fixes	2010-05-18 14:31:34 -07:00
Makefile	Staging: comedi: remove comedi_ksyms.c	2010-05-11 11:36:00 -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: David doesn't want to get comedi patches	2009-05-08 19:39:28 -07:00