tree 16148e0ffcca471d0acf20fa7c9410e8c7704519
parent 1b4757ee6f47502ca82782d270ccdc1caac8fc8e
parent 52d5b9aba1f5790ca3231c262979c2c3e26dd99b
author Linus Torvalds <torvalds@linux-foundation.org> 1377459824 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1377459824 -0700
mergetag object 52d5b9aba1f5790ca3231c262979c2c3e26dd99b
 type commit
 tag usb-3.11-rc7
 tagger Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1377454960 -0700
 
 USB fixes for 3.11-rc7
 
 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.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
 iEYEABECAAYFAlIaS6AACgkQMUfUDdst+yn3VgCgz2yVQXgy/yH2hmADV0CdhfdN
 yV4AnRRWaD9HgyJ9sGp6x8Uzrcs4oJqr
 =bSoP
 -----END PGP SIGNATURE-----

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