From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Oct 2009 22:34:55 +0000 (-0700)
Subject: Merge branch 'tty-fixes'
X-Git-Tag: v2.6.32-rc5~16
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d6047d79b90f6122fcbf2c3e783b507f7dd78fc6;p=~shefty%2Frdma-dev.git

Merge branch 'tty-fixes'

* branch 'tty-fixes':
  tty: use the new 'flush_delayed_work()' helper to do ldisc flush
  workqueue: add 'flush_delayed_work()' to run and wait for delayed work
  Make flush_to_ldisc properly handle parallel calls
---

d6047d79b90f6122fcbf2c3e783b507f7dd78fc6