summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-05 15:51:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-05 15:51:17 -0700
commit783e9e8ede8081f2511beefc75b0c87e1b3afc07 (patch)
treeea534b3587285036c7948f9548de6c7cd118234b /include
parentdf862f625d62c8d5aef41361a8d21e4f55a0e748 (diff)
parent6ed07d45d09bc2aa60e27b845543db9972e22a38 (diff)
Merge tag 'usb-3.15-rc4' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions