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)
commitfa488e22864370b610e61b540efe10ab4a41865b
tree0f8deff1272ed09544dbdd003bd40b5f665f1091
parenta9fd74cb5843d8b2e44fb42f792766649ad24bfc
parent412145947adfca60a4b5b4893fbae82dffa25edd
Merge git://git./linux/kernel/git/gregkh/tty-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  tty: Mark generic_serial users as BROKEN