Merge the right tty-fixes branch
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Oct 2009 21:59:24 +0000 (14:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Oct 2009 21:59:24 +0000 (14:59 -0700)
* 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
  tty: Make flush_to_ldisc() locking more robust


Trivial merge