diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-25 12:43:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-25 12:43:44 -0700 |
| commit | 5e25e4f304ce53004dcd01725938c0bc45c75d35 (patch) | |
| tree | 16148e0ffcca471d0acf20fa7c9410e8c7704519 /drivers/staging/comedi/drivers.c | |
| parent | 1b4757ee6f47502ca82782d270ccdc1caac8fc8e (diff) | |
| parent | 52d5b9aba1f5790ca3231c262979c2c3e26dd99b (diff) | |
Merge tag 'usb-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are two USB fixes for 3.11-rc7
One fixes a reported regression in the OHCI driver, and the other
fixes a reported build breakage in the USB phy drivers"
* tag 'usb-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
usb: phy: fix build breakage
USB: OHCI: add missing PCI PM callbacks to ohci-pci.c
Diffstat (limited to 'drivers/staging/comedi/drivers.c')
0 files changed, 0 insertions, 0 deletions