From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Mar 2010 20:40:03 +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=8dba8f949492cf2ffb32c1c2fbfe12c3f53b1866;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.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_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"
---

8dba8f949492cf2ffb32c1c2fbfe12c3f53b1866