summaryrefslogtreecommitdiff
path: root/net/mac80211/Kconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-05-13 16:03:10 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-13 16:04:02 -0700
commit2efeaeb00f26c13ac14b8d53684a8bbd3c343ce6 (patch)
tree7ad4ff45c9f6471dca1b6b004cf3757512a20a15 /net/mac80211/Kconfig
parent472b91274a6c6857877b5caddb875dcb5ecdfcb8 (diff)
parent43b416e5f6a3ce269571cfe25c8f1e8e9316c5b0 (diff)
Merge branch 'for-next' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb into usb-next
* 'for-next' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb: MAINTAINERS: tree moved to kernel.org usb: musb: Calling VBUS pulsing API when SRP is initiated. usb: otg: TWL6030: OMAP4430: Adding SRP VBUS pulsing API usb: musb: host: remove duplicate check in musb_ep_program() usb: musb: export musb_interrupt symbol usb: musb: allow musb and glue layers to be modules usb: musb: drop unneeded musb_debug trickery
Diffstat (limited to 'net/mac80211/Kconfig')
0 files changed, 0 insertions, 0 deletions