linux-stable/drivers/staging/comedi
Greg Kroah-Hartman e8cd29b774 Merge Linus's staging merge point into staging-next
This resolves the merge issue pointed out by Stephen in
drivers/iio/adc/meson_saradc.c.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-12-06 15:27:17 +01:00
..
drivers Merge Linus's staging merge point into staging-next 2017-12-06 15:27:17 +01:00
kcomedilib staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
comedi.h staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
comedi_buf.c staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
comedi_compat32.c staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
comedi_compat32.h staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
comedi_fops.c staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
comedi_internal.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
comedi_pci.c staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
comedi_pci.h staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
comedi_pcmcia.c staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
comedi_pcmcia.h staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
comedi_usb.c staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
comedi_usb.h staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
comedidev.h staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
comedilib.h staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
drivers.c staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
Kconfig staging: comedi: adv_pci_dio: update for PCI-1761 2017-10-18 15:45:48 +02:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
proc.c staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
range.c staging: comedi: Remove redundant license text 2017-11-28 13:20:46 +01:00
TODO comedi: note a coverity discovered hole that needs fixing 2016-03-05 14:56:55 -08:00