Greg Kroah-Hartman 912cbd4952 Merge 3.13-rc5 into staging-next ...

This resolves a merge issue with drivers/staging/imx-drm/imx-drm-core.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2013-12-24 10:06:37 -08:00

..

drivers

Merge 3.13-rc5 into staging-next

2013-12-24 10:06:37 -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 result of memdup_user for user chanlist

2013-12-17 13:10:40 -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

staging: comedi: remove DPRINTK macro

2013-11-26 09:55:13 -08:00

comedilib.h

staging: comedi: comedi_bond: handle base channel for insn_bits

2013-08-26 06:41:56 -07:00

drivers.c

Merge 3.13-rc5 into staging-next

2013-12-24 10:06:37 -08:00

Kconfig

staging: comedi: ni_6527: remove COMEDI_MITE dependancy

2013-10-03 14:10:03 -07: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