From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 Aug 2013 19:43:44 +0000 (-0700)
Subject: Merge tag 'usb-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
X-Git-Tag: v3.11-rc7~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5e25e4f304ce53004dcd01725938c0bc45c75d35;p=~emulex%2Finfiniband.git

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
---

5e25e4f304ce53004dcd01725938c0bc45c75d35