summaryrefslogtreecommitdiff
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-27 12:54:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-27 12:54:05 -0700
commit47b514cd476db2eca066a2ad31501b079d6c9cce (patch)
treeae7cf223281e82a3fc45da725d26bd1b94144837 /net/mac80211/cfg.c
parent2b25679453e55be112a6bf2463fa203d43a5f318 (diff)
parent3fcc8f96829776cf181918461923d1e3bbb831a2 (diff)
Merge tag 'usb-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg Kroah-Hartman: "Here are some small USB gadget bugfixes, and a few new USB device ids added to some drivers for the 3.5-rc5 release. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'usb-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: USB: CP210x Add 10 Device IDs USB: option: Add USB ID for Novatel Ovation MC551 usb: phy: Fix Kconfig dependency for Phy drivers usb-storage: revert commit afff07e61a52 (Add 090c:1000 to unusal-devs) SCSI & usb-storage: add try_rc_10_first flag usb: musb: host: release dma channels if no active io usb: gadget: lpc32xx_udc: fix build error with debugfs enabled usb: otg: twl6030-usb: Fix twl writes USB: option: add id for Cellient MEN-200 usb: dwc3: fix giveback of queued request in ep_dequeue usb: gadget: Complete fsl qe/udc driver conversion
Diffstat (limited to 'net/mac80211/cfg.c')
0 files changed, 0 insertions, 0 deletions