Merge remote branch 'common/android-2.6.32' into develop

author 黄涛 <huangtao@rock-chips.com>

Thu, 5 Aug 2010 08:41:38 +0000 (16:41 +0800)

committer 黄涛 <huangtao@rock-chips.com>

Thu, 5 Aug 2010 08:41:38 +0000 (16:41 +0800)
author 黄涛 <huangtao@rock-chips.com>
Thu, 5 Aug 2010 08:41:38 +0000 (16:41 +0800)
committer 黄涛 <huangtao@rock-chips.com>
Thu, 5 Aug 2010 08:41:38 +0000 (16:41 +0800)
diff --cc drivers/usb/gadget/android.c
Simple merge
diff --cc drivers/usb/gadget/composite.c
Simple merge
diff --cc drivers/usb/gadget/f_adb.c
Simple merge
author	黄涛 <huangtao@rock-chips.com>
	Thu, 5 Aug 2010 08:41:38 +0000 (16:41 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Thu, 5 Aug 2010 08:41:38 +0000 (16:41 +0800)
		1	2
drivers/usb/gadget/android.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/composite.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/f_adb.c	patch \|	diff1 \|	diff2 \|	blob \| history