diff options
| author | Linus Torvalds | 2012-10-01 21:09:59 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-10-01 21:09:59 +0200 |
| commit | 3aebd34b1200a902a8662da8845824a02f00772e (patch) | |
| tree | 13eac224dc1ac40be53bccc90f27bebf2e619c26 /net/core | |
| parent | Merge tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux (diff) | |
| parent | drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init (diff) | |
| download | kernel-qcow2-linux-3aebd34b1200a902a8662da8845824a02f00772e.tar.gz kernel-qcow2-linux-3aebd34b1200a902a8662da8845824a02f00772e.tar.xz kernel-qcow2-linux-3aebd34b1200a902a8662da8845824a02f00772e.zip | |
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
...
Diffstat (limited to 'net/core')
0 files changed, 0 insertions, 0 deletions