summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-20 15:13:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-20 15:13:56 -0700
commitf8fc0c9a5f7f4f5a3d2e7dd58147e30053cc5dd8 (patch)
tree92244b2aabeefcbf791205ff6bfe213c9b5c9d5f /kernel
parenta1821f774d4600727edf71005f259a9fdb73981e (diff)
parent49fbd3f1c3a67b99c053600a1cd7e5d0be48bed6 (diff)
downloadop-kernel-dev-f8fc0c9a5f7f4f5a3d2e7dd58147e30053cc5dd8.zip
op-kernel-dev-f8fc0c9a5f7f4f5a3d2e7dd58147e30053cc5dd8.tar.gz
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 'kernel')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud