summaryrefslogtreecommitdiffstats
path: root/net/irda
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-22 09:01:47 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-22 09:01:47 -1000
commitb71055beaaa7fddbbfd2a60644dcb308408f686c (patch)
treec9bf86b9ca08c654d25fba37acd93a4c6ff7781f /net/irda
parentdcfdc28f300380ad31033aa0bfb8cf80f23c453a (diff)
parent35a2fbc941accd0e9f1bfadd669311786118d874 (diff)
Merge tag 'usb-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg Kroah-Hartman: "Here are two USB patches for 3.10. One updates the Kconfig wording for CONFIG_USB_PHY to make it, hopefully, more obvious what this option is (I know you complained about this when it hit the tree.) The other is a new device id for a driver" * tag 'usb-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: USB: serial: ti_usb_3410_5052: new device id for Abbot strip port cable usb: phy: Improve Kconfig help for CONFIG_USB_PHY
Diffstat (limited to 'net/irda')
0 files changed, 0 insertions, 0 deletions