Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
author黄涛 <huangtao@rock-chips.com>
Thu, 10 Jul 2014 01:22:27 +0000 (09:22 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 10 Jul 2014 01:22:27 +0000 (09:22 +0800)
commit77ddfc9d50214cb453dc280580419fc551e77ffe
treec4a36032d13e3362c9e486e015c51efe7359acc2
parent032de7a4eb7fa49c9a1306170bbba522c690cd5a
parent3418d6a86e325eeb1e50e4ad06b03e7c2632c8d3
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

Conflicts:
drivers/usb/dwc_otg_310/usbdev_rk.h
drivers/usb/dwc_otg_310/dwc_otg_driver.c
drivers/usb/dwc_otg_310/usbdev_rk.h