Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Oct 2009 19:15:58 +0000 (12:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Oct 2009 19:15:58 +0000 (12:15 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  tty: Mark generic_serial users as BROKEN


Trivial merge