Greg Kroah-Hartman 9f48c89862 Merge 3.16-rc5 into char-misc-next ...

This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.

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

2014-07-13 15:26:47 -07:00

..

Kconfig

drivers: uio: Kconfig: add MMU dependancy for UIO

2013-08-30 14:19:46 -07:00

Makefile

drivers: uio: Add driver for Humusoft MF624 DAQ PCI card

2013-08-30 12:12:49 -07:00

uio_aec.c

uio: uio_aec: remove unnecessary pci_set_drvdata()

2013-09-26 08:47:25 -07:00

uio_cif.c

uio: uio_cif: remove unnecessary pci_set_drvdata()

2013-09-26 08:47:25 -07:00

uio_dmem_genirq.c

drivers: uio_dmem_genirq: Fix memory leak in uio_dmem_genirq_probe()

2014-05-27 14:11:06 -07:00

uio_mf624.c

uio: uio_mf624: remove DEFINE_PCI_DEVICE_TABLE macro

2013-12-08 22:41:48 -08:00

uio_netx.c

uio: uio_netx: remove unnecessary pci_set_drvdata()

2013-09-26 08:47:25 -07:00

uio_pci_generic.c

uio/uio_pci_generic: Use module_pci_driver to register driver

2013-05-21 13:59:25 -07:00

uio_pdrv_genirq.c

uio: Simplify uio error path by using devres functions

2013-09-26 08:46:45 -07:00

uio_pruss.c

uio: uio_pruss: use struct device

2014-07-09 17:32:06 -07:00

uio_sercos3.c

uio: uio_sercos3: remove unnecessary pci_set_drvdata()

2013-09-26 08:47:25 -07:00

uio.c

Revert "uio: fix vma io range check in mmap"

2014-06-17 16:07:08 -07:00