diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-27 16:49:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-27 16:49:15 -0700 |
| commit | a31fb6988a37f46f3a677aa5bc982094f3a03567 (patch) | |
| tree | 33e7c47fea41aa4dee69724c4aab9a142dc1cbcc /drivers/input/misc/ab8500-ponkey.c | |
| parent | 8dce30c89113e314d29d3b8f362aadff8087fccb (diff) | |
| parent | 0d00dc2611abbe6ad244d50569c2ee82ce42846c (diff) | |
Merge tag 'usb-3.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg Kroah-Hartman:
"Here are two USB bugfixes for your 3.6-rc7 tree.
The OHCI fix has been reported a number of times and is a regression
from 3.5, and the patch that causes the regression was on the way to
the -stable trees before I was reminded (again) that this fix needed
to get to your tree soon.
The host controller bugfix was reported in older kernels as being
pretty easy to trigger, and has been tested by Red Hat and their
customers.
Both have been in the usb-next branch in the -next tree for a while
now, I just cherry-picked them out to get to you in time for the 3.6
release.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'usb-3.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
USB: Fix race condition when removing host controllers
USB: ohci-at91: fix null pointer in ohci_hcd_at91_overcurrent_irq
Diffstat (limited to 'drivers/input/misc/ab8500-ponkey.c')
0 files changed, 0 insertions, 0 deletions