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

diff --cc arch/arm/mach-at91/at91rm9200_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9261_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9rl_devices.c
Simple merge

diff --cc arch/arm/mach-at91/gpio.c
Simple merge

diff --cc drivers/tty/hvc/hvc_console.c
Simple merge

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

diff --cc include/linux/platform_data/atmel.h
index 1466443797d74a96214e803b95dc397f86319fc4,cea9f70133c521f1d5fb2a0d459f3e30ca3f9576..4b452c6a2f7be58b65214c3c6b6002e00d23bacd
--- 1/include/linux/platform_data/atmel.h
--- 2/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@@ -84,9 -84,15 +84,8 @@@ struct atmel_uart_data 
        short                   use_dma_rx;     /* use receive DMA? */
        void __iomem            *regs;          /* virt. base address, if any */
        struct serial_rs485     rs485;          /* rs485 settings */
-       int                     rts_gpio;       /* optional RTS GPIO */
  };
  
 - /* Touchscreen Controller */
 -struct at91_tsadcc_data {
 -      unsigned int    adc_clock;
 -      u8              pendet_debounce;
 -      u8              ts_sample_hold_time;
 -};
 -
  /* CAN */
  struct at91_can_data {
        void (*transceiver_switch)(int on);

diff --cc kernel/printk/printk.c
Simple merge