Hi Greg,

Today's linux-next merge of the usb.current tree got a trivial conflict
in drivers/usb/gadget/serial.c.  It looks like someone fixed up the
spacing around some ','s before the "USB: serial gadget: cleanup/reorg"
patch went into Linus' tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/