]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 04:48:54 +0000 (15:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 04:48:54 +0000 (15:48 +1100)
commitda7f9f72fecde73884b233f9d8a2fb557463e3fc
tree3393e28e752282e82795ed2b9693edf1dd93bf06
parentf73d79c142db2e7cf6b2876a0af9130b9e0db8c2
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