From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Apr 2010 17:16:42 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
X-Git-Tag: v2.6.34-rc7~37
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=87156d692afdc4c689e99380a263445217a4b76c;p=~shefty%2Frdma-dev.git

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:
  serial: drivers/serial/pmac_zilog.c: add missing unlock
  serial: 8250_pnp - add Fujitsu Wacom device
  tty: Fix regressions in the char driver conversion
---

87156d692afdc4c689e99380a263445217a4b76c