linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: usb.current merge conflict
@ 2008-05-15  1:12 Stephen Rothwell
  2008-05-15  2:39 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2008-05-15  1:12 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

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/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-05-15  2:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-15  1:12 linux-next: usb.current merge conflict Stephen Rothwell
2008-05-15  2:39 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).