]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 21 Nov 2011 01:57:02 +0000 (12:57 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 21 Nov 2011 01:57:02 +0000 (12:57 +1100)
commitf4622db60386a268f206c6963b2eb327b8277447
tree9636ffea2c136990fa0ee9ed6909d73102613618
parentc3f1375f70418ca5dbf07f95afe0242330a18c0c
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