tree 4091ff408dd6873609e3f3341b0b3972155b7201
parent 601adfedba37326410760d8d60f5da99a0adfd2f
parent 514fc01d389cf5d364ee3b5fec4ac1487448803e
author Linus Torvalds <torvalds@linux-foundation.org> 1255559695 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255559695 -0700

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