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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/tty/serial/8250/8250_dma.c
Simple merge

diff --cc drivers/tty/serial/sc16is7xx.c
Simple merge

diff --cc include/linux/platform_data/atmel.h
index c841e7e349729adf3a4bab9f0b47aaca8d7b6643,c4bc90bfebe0b7904c91f3ed27a4c2a8b56bd935..e649d8d370f8954435b79728e95db462795add5f
--- 1/include/linux/platform_data/atmel.h
--- 2/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@@ -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 */