Merge "USB: composite: Send stall when no config is active"

author Linux Build Service Account <lnxbuild@localhost>

Tue, 20 Dec 2016 22:04:22 +0000 (14:04 -0800)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Tue, 20 Dec 2016 22:04:22 +0000 (14:04 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Tue, 20 Dec 2016 22:04:22 +0000 (14:04 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Tue, 20 Dec 2016 22:04:22 +0000 (14:04 -0800)
diff --cc drivers/usb/gadget/composite.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Tue, 20 Dec 2016 22:04:22 +0000 (14:04 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Tue, 20 Dec 2016 22:04:22 +0000 (14:04 -0800)