The following commit has been merged in the linux branch: commit fa488e22864370b610e61b540efe10ab4a41865b Merge: a9fd74cb5843d8b2e44fb42f792766649ad24bfc 412145947adfca60a4b5b4893fbae82dffa25edd Author: Linus Torvalds torvalds@linux-foundation.org Date: Sat Oct 31 12:15:58 2009 -0700

Merge git://git.kernel.org/pub/scm/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