Merge remote-tracking branch 'usb/usb-next'

diff --cc Documentation/devicetree/bindings/usb/dwc3.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smartq.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
Simple merge

diff --cc drivers/usb/chipidea/ci_hdrc_imx.c
Simple merge

diff --cc drivers/usb/gadget/function/u_serial.c
Simple merge

diff --cc include/linux/platform_data/atmel.h
index e649d8d370f8954435b79728e95db462795add5f,9127ebbaa48761c9321f58254e7a9241d3200769..3c8825b67298fafe60f22c803206f9f0789fc8f7
--- 1/include/linux/platform_data/atmel.h
--- 2/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@@ -9,17 -9,22 +9,8 @@@
  
  #include <linux/mtd/nand.h>
  #include <linux/mtd/partitions.h>
 -#include <linux/device.h>
 -#include <linux/i2c.h>
 -#include <linux/leds.h>
 -#include <linux/spi/spi.h>
 -#include <linux/usb/atmel_usba_udc.h>
 -#include <linux/atmel-mci.h>
 -#include <sound/atmel-ac97c.h>
  #include <linux/serial.h>
 -#include <linux/platform_data/macb.h>
 -
 -/*
 - * at91: 6 USARTs and one DBGU port (SAM9260)
 - * avr32: 4
 - */
 -#define ATMEL_MAX_UART        7
  
-  /* USB Device */
- struct at91_udc_data {
-       int     vbus_pin;               /* high == host powering us */
-       u8      vbus_active_low;        /* vbus polarity */
-       u8      vbus_polled;            /* Use polling, not interrupt */
-       int     pullup_pin;             /* active == D+ pulled up */
-       u8      pullup_active_low;      /* true == pullup_pin is active low */
- };
- 
   /* Compact Flash */
  struct at91_cf_data {
        int     irq_pin;                /* I/O IRQ */