From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 May 2014 22:51:17 +0000 (-0700)
Subject: Merge tag 'usb-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
X-Git-Tag: MMI-PSA29.97-13-9~12251
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=783e9e8ede8081f2511beefc75b0c87e1b3afc07;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'usb-3.15-rc4' of git://git./linux/kernel/git/gregkh/usb

Pull USB fixes from Greg KH:
 "Here are some small fixes and device ids for 3.15-rc4.

  All have been in linux-next just fine"

* tag 'usb-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: Nokia 5300 should be treated as unusual dev
  USB: Nokia 305 should be treated as unusual dev
  fsl-usb: do not test for PHY_CLK_VALID bit on controller version 1.6
  usb: storage: shuttle_usbat: fix discs being detected twice
  usb: qcserial: add a number of Dell devices
  USB: OHCI: fix problem with global suspend on ATI controllers
  usb: gadget: at91-udc: fix irq and iomem resource retrieval
  usb: phy: fsm: change "|" to "||" for condition OTG_STATE_A_WAIT_BCON at statemachine
  usb: phy: fsm: update OTG HNP state transition
---

783e9e8ede8081f2511beefc75b0c87e1b3afc07