Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:46:44 +0000 (14:46 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:46:44 +0000 (14:46 +1100)
1  2 
Documentation/kernel-parameters.txt
drivers/tty/serial/8250/8250_dma.c
drivers/tty/serial/sc16is7xx.c
include/linux/platform_data/atmel.h

Simple merge
Simple merge
Simple merge
@@@ -9,14 -9,16 +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 */