From: Linus Torvalds Date: Tue, 7 Sep 2010 21:04:09 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=608a5ffc3ee0d6f4aff53e902659201eeaeb9c06;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge git://git./linux/kernel/git/gregkh/tty-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: tty: fix tty_line must not be equal to number of allocated tty pointers in tty driver serial: bfin_sport_uart: restore transmit frame sync fix serial: fix port type conflict between NS16550A & U6_16550A MAINTAINERS: orphan isicom vt: Fix console corruption on driver hand-over. --- 608a5ffc3ee0d6f4aff53e902659201eeaeb9c06