tree e9f59d817acea309ce9b2ddb4574dfeb4e153e5a
parent a3ccf63ee643ef243cbf8918da8b3f9238f10029
parent 97ad5a034dcc164269d0b8a5cb3e827b33455c11
author Linus Torvalds <torvalds@linux-foundation.org> 1255643964 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255643964 -0700

Merge the right tty-fixes branch

* 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