leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7ca363f687
linux/drivers/staging/comedi
History
Greg Kroah-Hartman 7ca363f687 Merge branch 'staging-linus' into staging-work 
This is to pull in the lustre fixes so that others can continue to work
on updating the lustre codebase, as well as resolve some merge issues
with the ion and ocproto drivers to keep linux-next happy.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-08 13:38:28 -08:00
..
drivers Merge branch 'staging-linus' into staging-work 2014-02-08 13:38:28 -08:00
kcomedilib staging: comedi: remove comedi_debug module parameter 2013-11-25 11:50:53 -08:00
comedi_buf.c staging: comedi: protect buffer from being freed while mmapped 2013-11-11 16:16:45 -08:00
comedi_compat32.c file->f_op is never NULL... 2013-10-24 23:34:54 -04:00
comedi_compat32.h staging: comedi: remove FSF address from boilerplate text 2013-05-13 17:34:22 -04:00
comedi_fops.c staging: comedi: fix bug destroying subdevice files after parent 2014-01-09 10:50:13 -08:00
comedi_internal.h staging: comedi: protect buffer from being freed while mmapped 2013-11-11 16:16:45 -08:00
comedi_pci.c staging: comedi: remove FSF address from boilerplate text 2013-05-13 17:34:22 -04:00
comedi_pcmcia.c staging: comedi: remove FSF address from boilerplate text 2013-05-13 17:34:22 -04:00
comedi_usb.c staging: comedi: introduce comedi_to_usb_dev() 2013-05-21 10:59:10 -07:00
comedi.h staging: comedi: remove FSF address from boilerplate text 2013-05-13 17:34:22 -04:00
comedidev.h comedi: Humusoft MF634 and MF624 DAQ cards driver 2014-01-13 15:03:12 -08:00
comedilib.h staging: comedi: comedi_bond: handle base channel for insn_bits 2013-08-26 06:41:56 -07:00
drivers.c staging: comedi: fix too early cleanup in comedi_auto_config() 2014-02-07 11:08:46 -08:00
Kconfig comedi: Humusoft MF634 and MF624 DAQ cards driver 2014-01-13 15:03:12 -08:00
Makefile staging: comedi: remove comedi_debug module parameter 2013-11-25 11:50:53 -08:00
proc.c staging: comedi: use refcount while reading /proc/comedi 2013-11-11 16:16:44 -08:00
range.c staging: comedi: range: remove use of DPRINTK 2013-11-25 11:50:53 -08:00
TODO MAINTAINERS: Update the list of maintainers for staging/comedi driver. 2013-07-24 09:51:18 -07:00