Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0

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

Wed, 30 Nov 2011 02:36:13 +0000 (10:36 +0800)

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

Wed, 30 Nov 2011 02:36:13 +0000 (10:36 +0800)
author 黄涛 <huangtao@rock-chips.com>
Wed, 30 Nov 2011 02:36:13 +0000 (10:36 +0800)
committer 黄涛 <huangtao@rock-chips.com>
Wed, 30 Nov 2011 02:36:13 +0000 (10:36 +0800)
diff --cc drivers/misc/Kconfig
Simple merge
diff --cc drivers/misc/Makefile
Simple merge
diff --cc drivers/usb/gadget/android.c
Simple merge
author	黄涛 <huangtao@rock-chips.com>
	Wed, 30 Nov 2011 02:36:13 +0000 (10:36 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Wed, 30 Nov 2011 02:36:13 +0000 (10:36 +0800)
		1	2
drivers/misc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/android.c	patch \|	diff1 \|	diff2 \|	blob \| history