tree 38658ba63eb2fccaf9f3d23112c84a31a40e257f
parent 78f220a84f464ff1a74d1b646e9b96bdddc47050
parent 6eb68d6f3bf1707d5d816ea9242b7d38f25b942e
author Linus Torvalds <torvalds@linux-foundation.org> 1283893449 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1283893449 -0700

Merge git://git.kernel.org/pub/scm/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.