Merge remote-tracking branch 'usb/usb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 02:36:14 +0000 (13:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 02:36:14 +0000 (13:36 +1100)
1  2 
Documentation/devicetree/bindings/usb/dwc3.txt
MAINTAINERS
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s3c64xx/mach-smartq.c
arch/arm/mach-s3c64xx/mach-smdk6410.c
drivers/usb/chipidea/ci_hdrc_imx.c
drivers/usb/gadget/function/u_serial.c
include/linux/platform_data/atmel.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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 */