| commit | abfa44b5fd4a2f5d7549005bec465d4823a263ff | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 01 08:05:19 2011 +1000 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 01 08:05:19 2011 +1000 |
| tree | 98376516ae6a314569b589df1f6ac6d49831bde5 | |
| parent | 70d1f365568e0cdbc9f4ab92428e1830fdb09ab0 [diff] | |
| parent | fed7bb324cffd980a4a576514ced3ff52f68f319 [diff] |
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: tty/serial: fix apbuart build n_hdlc: fix read and write locking serial: unbreak billionton CF card tty: use for_each_console() and WARN() on sysfs failures vt: fix issue when fbcon wants to takeover a second time. Fix up trivial conflict in drivers/tty/tty_io.c