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)
commitc7e039e278f094a51d706b217cfdb92a7bfb37a6
tree25bcfbe26e83590110ebed627976706c46636053
parentd00e5f74ae65f54f401f66efea3d734b6b136cab
parent750bc63a1a0ade99ed97cb5beb026ca944dc5c56
Merge remote branch 'common/android-2.6.32' into develop

Conflicts:
drivers/usb/gadget/f_adb.c
drivers/usb/gadget/android.c
drivers/usb/gadget/composite.c
drivers/usb/gadget/f_adb.c