Merge tag 'char-misc-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc updates from Greg KH: "Here's the big char/misc driver tree merge for 3.11-rc1 A variety of different driver patches here. All of these have been in linux-next for a while, and the networking patches were acked-by David Miller, as it made sense for those patches to come through this tree" * tag 'char-misc-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (102 commits) Revert "char: misc: assign file->private_data in all cases" drivers: uio_pdrv_genirq: Use of_match_ptr() macro mei: check whether hw start has succeeded mei: check if the hardware reset succeeded mei: mei_cl_connect: don't multiply the timeout twice mei: do not override a client writing state when buffering mei: move mei_cl_irq_write_complete to client.c UIO: Fix concurrency issue drivers: uio_dmem_genirq: Use of_match_ptr() macro char: misc: assign file->private_data in all cases drivers: hv: allocate synic structures before hv_synic_init() drivers: hv: check interrupt mask before read_index vme: vme_tsi148.c: fix error return code in tsi148_probe() FMC: fix error handling in probe() function fmc: avoid readl/writel namespace conflict FMC: NULL dereference on allocation failure UIO: fix uio_pdrv_genirq with device tree but no interrupt UIO: allow binding uio_pdrv_genirq.c to devices using command line option FMC: add a char-device mezzanine driver FMC: add a driver to write mezzanine EEPROM ...
No related branches found
No related tags found
Showing
- drivers/misc/mei/wd.c 0 additions, 6 deletionsdrivers/misc/mei/wd.c
- drivers/misc/pch_phub.c 19 additions, 25 deletionsdrivers/misc/pch_phub.c
- drivers/misc/sgi-gru/gruprocfs.c 5 additions, 9 deletionsdrivers/misc/sgi-gru/gruprocfs.c
- drivers/misc/spear13xx_pcie_gadget.c 47 additions, 22 deletionsdrivers/misc/spear13xx_pcie_gadget.c
- drivers/misc/sram.c 3 additions, 6 deletionsdrivers/misc/sram.c
- drivers/misc/ti-st/st_kim.c 3 additions, 3 deletionsdrivers/misc/ti-st/st_kim.c
- drivers/misc/ti_dac7512.c 4 additions, 2 deletionsdrivers/misc/ti_dac7512.c
- drivers/misc/tsl2550.c 2 additions, 2 deletionsdrivers/misc/tsl2550.c
- drivers/net/netconsole.c 1 addition, 0 deletionsdrivers/net/netconsole.c
- drivers/pcmcia/Kconfig 2 additions, 2 deletionsdrivers/pcmcia/Kconfig
- drivers/pcmcia/at91_cf.c 88 additions, 88 deletionsdrivers/pcmcia/at91_cf.c
- drivers/pcmcia/pd6729.c 2 additions, 0 deletionsdrivers/pcmcia/pd6729.c
- drivers/uio/uio_aec.c 1 addition, 13 deletionsdrivers/uio/uio_aec.c
- drivers/uio/uio_cif.c 1 addition, 13 deletionsdrivers/uio/uio_cif.c
- drivers/uio/uio_dmem_genirq.c 1 addition, 3 deletionsdrivers/uio/uio_dmem_genirq.c
- drivers/uio/uio_netx.c 1 addition, 13 deletionsdrivers/uio/uio_netx.c
- drivers/uio/uio_pci_generic.c 2 additions, 15 deletionsdrivers/uio/uio_pci_generic.c
- drivers/uio/uio_pdrv_genirq.c 29 additions, 25 deletionsdrivers/uio/uio_pdrv_genirq.c
- drivers/uio/uio_pruss.c 1 addition, 1 deletiondrivers/uio/uio_pruss.c
- drivers/uio/uio_sercos3.c 1 addition, 13 deletionsdrivers/uio/uio_sercos3.c
Loading
Please register or sign in to comment