Merge remote-tracking branch 'usb/usb-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 5 Aug 2013 05:08:30 +0000 (15:08 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 5 Aug 2013 05:08:30 +0000 (15:08 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 05:08:30 +0000 (15:08 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 05:08:30 +0000 (15:08 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/usb/serial/ftdi_sio.c
Simple merge
diff --cc drivers/usb/serial/mos7840.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 5 Aug 2013 05:08:30 +0000 (15:08 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 5 Aug 2013 05:08:30 +0000 (15:08 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/ftdi_sio.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/mos7840.c	patch \|	diff1 \|	diff2 \|	blob \| history