Merge tag 'char-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver merge from Greg Kroah-Hartman: "Here is the "big" char/misc driver tree update for the 3.7-rc1 merge window. Nothing major, just a number of driver updates and fixes, all of which have been in the linux-next releases for a while now either in my tree, or in Andrew's (the lis3l driver changes came from his tree last week). Signed-off-by:Greg Kroah-Hartman <gregkh@linuxfoundation.org>"> * tag 'char-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (52 commits) drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init drivers/misc/lis3lv02d/lis3lv02d_spi.c: add lis3lv02d device tree init drivers/misc/lis3lv02d: remove lis3lv02d driver DT init drivers/misc/lis3lv02d/lis3lv02d_spi.c: add DT matching table passthru code drivers/misc/lis3lv02d: add generic DT matching code lis3lv02d: fix some comments specific to lis331dlh driver MISC: hpilo, remove pci_disable_device pcmcia: synclink_cs: fix potential tty NULL dereference drivers/char/mmtimer.c: Remove useless kfree drivers/char: removes unnecessary semicolon char/misc: remove CONFIG_EXPERIMENTAL dependencies mei: don't print buffer as a string mei: struct mei_message_data doesn't have to be packed mei: add error messages for open count errors misc: use module_spi_driver tifm: use module_pci_driver misc/at25, dt: Improve at25 SPI eeprom device tree bindings. mei: add lynx point pci device ids mei: fix max number of open handles mei: rename struct pci_dev *mei_device to mei_pdev ...
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/misc/at25.txt 24 additions, 10 deletionsDocumentation/devicetree/bindings/misc/at25.txt
- Documentation/devicetree/bindings/misc/lis302.txt 112 additions, 0 deletionsDocumentation/devicetree/bindings/misc/lis302.txt
- Documentation/devicetree/bindings/w1/w1-gpio.txt 22 additions, 0 deletionsDocumentation/devicetree/bindings/w1/w1-gpio.txt
- Documentation/misc-devices/lis3lv02d 2 additions, 1 deletionDocumentation/misc-devices/lis3lv02d
- drivers/char/Kconfig 3 additions, 3 deletionsdrivers/char/Kconfig
- drivers/char/mmtimer.c 1 addition, 2 deletionsdrivers/char/mmtimer.c
- drivers/char/nwbutton.c 2 additions, 2 deletionsdrivers/char/nwbutton.c
- drivers/char/pcmcia/synclink_cs.c 13 additions, 7 deletionsdrivers/char/pcmcia/synclink_cs.c
- drivers/char/ppdev.c 2 additions, 1 deletiondrivers/char/ppdev.c
- drivers/char/rtc.c 1 addition, 1 deletiondrivers/char/rtc.c
- drivers/char/tlclk.c 3 additions, 1 deletiondrivers/char/tlclk.c
- drivers/char/virtio_console.c 11 additions, 1 deletiondrivers/char/virtio_console.c
- drivers/misc/Kconfig 7 additions, 7 deletionsdrivers/misc/Kconfig
- drivers/misc/bmp085-i2c.c 0 additions, 7 deletionsdrivers/misc/bmp085-i2c.c
- drivers/misc/bmp085-spi.c 1 addition, 12 deletionsdrivers/misc/bmp085-spi.c
- drivers/misc/c2port/Kconfig 2 additions, 3 deletionsdrivers/misc/c2port/Kconfig
- drivers/misc/carma/carma-fpga-program.c 0 additions, 1 deletiondrivers/misc/carma/carma-fpga-program.c
- drivers/misc/carma/carma-fpga.c 1 addition, 1 deletiondrivers/misc/carma/carma-fpga.c
- drivers/misc/eeprom/Kconfig 1 addition, 1 deletiondrivers/misc/eeprom/Kconfig
- drivers/misc/eeprom/at25.c 58 additions, 25 deletionsdrivers/misc/eeprom/at25.c
Loading
Please register or sign in to comment