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

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

Thu, 1 Sep 2011 02:49:47 +0000 (12:49 +1000)

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

Thu, 1 Sep 2011 02:49:47 +0000 (12:49 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Sep 2011 02:49:47 +0000 (12:49 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Sep 2011 02:49:47 +0000 (12:49 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-mmp/pxa168.c
Simple merge
diff --cc drivers/usb/class/cdc-acm.c
Simple merge
diff --cc drivers/usb/class/cdc-wdm.c
Simple merge
diff --cc drivers/usb/core/hub.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 1 Sep 2011 02:49:47 +0000 (12:49 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 1 Sep 2011 02:49:47 +0000 (12:49 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/pxa168.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/class/cdc-acm.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/class/cdc-wdm.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	patch \|	diff1 \|	diff2 \|	blob \| history