tree eb91a9a4f3ab0f71ca388fd17cb7dd9e03adb9f4
parent 2eb645e7b5662da47646f76b41b4141f2c9bf13a
parent 336cee42dd52824e360ab419eab4e8888eb054ec
author Linus Torvalds <torvalds@linux-foundation.org> 1269031203 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1269031203 -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_port,usb-console: Fix usb serial console open/close regression
  tty: cpm_uart: use resource_size()
  tty_buffer: Fix distinct type warning
  hvc_console: Fix race between hvc_close and hvc_remove
  uartlite: Fix build on sparc.
  tty: Take a 256 byte padding into account when buffering below sub-page units
  Revert "tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call"