Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/musb/musb_gadget.c between commit
7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
unnecessary return's from void functions") from the trivial tree and
commit 82cccbf2458e50dabf8b9946b3f0ef0e8d31711f ("usb: musb: gadget: kill
unreachable code in musb_g_rx()") from the usb tree.

The latter also fixes the problem fixed in the former, so I just used the
latter.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/