Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

Conflicts:
	drivers/usb/dwc_otg_310/usbdev_rk.h

diff --cc drivers/usb/dwc_otg_310/dwc_otg_driver.c
Simple merge

diff --cc drivers/usb/dwc_otg_310/usbdev_rk.h
index 8f4389e10a856b71fc4627e1b768b550cf2c9337,0c6e48a57d9812482ec4d16e1add619b84cfb963..c6d9e76d26942e8c70b594af036e5beceb532a65
--- 1/drivers/usb/dwc_otg_310/usbdev_rk.h
--- 2/drivers/usb/dwc_otg_310/usbdev_rk.h
+++ b/drivers/usb/dwc_otg_310/usbdev_rk.h
@@@ -41,9 -41,13 +42,16 @@@
  #define USB_REMOTE_WAKEUP     (6)
  #define USB_IRQ_WAKEUP        (7)
  
 +#define UOC_HIWORD_UPDATE(val, mask, shift) \
 +              ((val) << (shift) | (mask) << ((shift) + 16))
 +
+ enum rkusb_rst_flag {
+       RST_POR = 0, /* Reset power-on */
+       RST_RECNT,      /* Reset re-connect */
+       RST_CHN_HALT, /* Reset a channel halt has been detected */
+       RST_OTHER,
+ };
+ 
  extern int rk_usb_charger_status;
  extern void rk_send_wakeup_key(void);
  /* rk3188 platform data */