Merge branch 'for-usb' of git://git.kernel.org/pub/scm/linux/kernel/git/geoff/ps3...
authorGreg Kroah-Hartman <gregkh@suse.de>
Sat, 10 Dec 2011 00:09:49 +0000 (16:09 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 10 Dec 2011 00:10:29 +0000 (16:10 -0800)
* 'for-usb' of git://git.kernel.org/pub/scm/linux/kernel/git/geoff/ps3-linux:
  usb: PS3 EHCI QH read work-around
  usb: Fix PS3 EHCI suspend
  usb: PS3 EHCI HC reset work-around
  usb: Remove ehci_reset call from ehci_run

1  2 
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-s5p.c

Simple merge
Simple merge