Revert "temp revert usb gadget change"
author黄涛 <huangtao@rock-chips.com>
Sun, 31 Jul 2011 17:29:20 +0000 (01:29 +0800)
committer黄涛 <huangtao@rock-chips.com>
Sun, 31 Jul 2011 17:29:20 +0000 (01:29 +0800)
commite26e3477448079dbec29acc1c414c3d6316a5a59
treecf943ecd526e0b97bff01e4cd1845672f6b31e85
parent7f56e2413702a67648ec9e109115fd3d0c5236d7
Revert "temp revert usb gadget change"

This reverts commit aa382e22fb1ff34df15ec71d14182c11264526d9.

Conflicts:

drivers/usb/gadget/composite.c
drivers/usb/gadget/f_mass_storage.c
drivers/usb/gadget/android.c
drivers/usb/gadget/composite.c
drivers/usb/gadget/f_adb.c
drivers/usb/gadget/f_mass_storage.c
drivers/usb/gadget/storage_common.c