Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into devel-stable

diff --combined drivers/usb/gadget/s3c-hsotg.c
index 5fc80a104150aef353391596fc0ed17c476136c6,458f7651957dbccb8824b176ac7933494bfca70d..9941fc6134134e1995475e800eb7ecb216e94bab
--- 1/drivers/usb/gadget/s3c-hsotg.c
--- 2/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@@ -30,7 -30,7 +30,7 @@@
  
  #include <plat/regs-usb-hsotg-phy.h>
  #include <plat/regs-usb-hsotg.h>
- #include <plat/regs-sys.h>
+ #include <mach/regs-sys.h>
  #include <plat/udc-hs.h>
  
  #define DMA_ADDR_INVALID (~((dma_addr_t)0))
@@@ -2582,7 -2582,6 +2582,7 @@@ err
        hsotg->gadget.dev.driver = NULL;
        return ret;
  }
 +EXPORT_SYMBOL(usb_gadget_register_driver);
  
  int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
  {