]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 03:30:08 +0000 (14:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 03:30:08 +0000 (14:30 +1100)
commit8696e50d959d826ca1484b72e7b963b5d3f17b37
treec07b8070abe00c9450f0b0d72a6868c5b656be35
parent732ca1e4b7a898c82d5e0bf7b051dd8ea3bcc2b5
parent161e773cbd0c3d1b5b8cc00602e1f72de61ed4f7
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
drivers/tty/tty_ldisc.c
arch/x86/include/asm/mrst.h
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/mfd.c
drivers/tty/serial/pch_uart.c
drivers/tty/tty_ldisc.c
include/linux/serial_core.h