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

…

Makefile

…

uio_aec.c

…

uio_cif.c

…

uio_dmem_genirq.c

…

uio_mf624.c

…

uio_netx.c

…

uio_pci_generic.c

…

uio_pdrv_genirq.c

…

uio_pruss.c

uio: uio_pruss: use struct device

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

uio_sercos3.c

…

uio.c

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

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