Greg Kroah-Hartman 0c9e98af5e Merge Linux 3.0-rc6 into staging-next ... This handles the merge conflicts with the drivers/staging/brcm80211/Kconfig file due to changes on the two different branches. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2011-07-05 07:35:09 -07:00
..
drivers	staging: comedi (adv_pci1723): coding style, fix whitespace before quoted newline	2011-06-28 13:27:20 -07:00
kcomedilib	Staging: comedi: kcomedilib: fix coding style issues in kcomedilib_main.c	2010-07-08 13:15:16 -07:00
comedi.h	staging: comedi: fixed a declaration coding style issue	2011-06-28 13:23:56 -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: remove unnecessary code	2011-06-28 13:13:42 -07:00
comedi_fops.h	Staging: comedi: fix up remaining coding style issue in proc.c	2010-05-11 11:35:58 -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: drivers.c: fix PAGE_KERNEL_NOCACHE issue	2011-06-09 12:13:53 -07:00
internal.h	Staging: comedi: drivers.c sparse cleanup	2010-05-11 11:36:03 -07:00
Kconfig	Staging: comedi: fix build breakages on some platforms	2011-06-27 14:43:34 -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