diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-21 00:13:56 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-21 00:13:56 +0200 |
commit | f8fc0c9a5f7f4f5a3d2e7dd58147e30053cc5dd8 (patch) | |
tree | 92244b2aabeefcbf791205ff6bfe213c9b5c9d5f /drivers/base | |
parent | Merge tag 'tty-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
parent | misc: mei: set WDIOF_ALARMONLY on mei watchdog (diff) | |
download | linux-f8fc0c9a5f7f4f5a3d2e7dd58147e30053cc5dd8.tar.xz linux-f8fc0c9a5f7f4f5a3d2e7dd58147e30053cc5dd8.zip |
Merge tag 'char-misc-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull misc tree updates from Greg Kroah-Hartman:
"Here are some drivers/misc bugfixes (really just drivers/misc/mei/
fixes) for a few problems that have been reported.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'char-misc-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
misc: mei: set WDIOF_ALARMONLY on mei watchdog
misc: mei: Disable MSI when IRQ registration fails
misc: mei: fix stalled read
misc: mei: unregister misc device in pci_remove function
misc: mei: set IRQF_ONESHOT for msi request_threaded_irq
Diffstat (limited to 'drivers/base')
0 files changed, 0 insertions, 0 deletions