Greg Kroah-Hartman c87985a3ce Merge tty-next into 3.6-rc1 ... This handles the merge issue in: arch/um/drivers/line.c arch/um/drivers/line.h And resolves the duplicate patches that were in both trees do to the tty-next branch not getting merged into 3.6-rc1. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-08-06 09:48:31 -07:00
..
atmel-usart.txt	tty/serial: RS485 bindings for device tree	2011-10-18 16:40:33 -07:00
efm32-uart.txt	serial/efm32: add new driver	2012-01-26 11:29:47 -08:00
fsl-imx-uart.txt	ARM: imx: rename uart and fec device tree nodes	2012-05-11 15:08:24 +08:00
fsl-mxs-auart.txt	serial: mxs-auart: Allow device tree probing	2012-07-03 13:22:35 +08:00
msm_serial.txt	msm_serial: Add devicetree support	2011-08-29 12:47:36 -07:00
nxp-lpc32xx-hsuart.txt	serial: Add driver for LPC32xx High Speed UARTs	2012-06-12 15:48:01 -07:00
of-serial.txt	serial/of-serial: Add LPC3220 standard UART compatible string	2012-07-26 13:37:02 -07:00
snps-dw-apb-uart.txt	tty: add a DesignWare 8250 driver	2011-08-26 11:38:46 -07:00