Linus Torvalds abfa44b5fd 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

2011-02-01 08:05:19 +10:00

..

.gitignore

TTY: move .gitignore from drivers/char/ to drivers/tty/vt/

2010-11-05 22:18:23 -07:00

consolemap.c

TTY: create drivers/tty/vt and move the vt code there

2010-11-05 08:16:52 -07:00

cp437.uni

TTY: create drivers/tty/vt and move the vt code there

2010-11-05 08:16:52 -07:00

defkeymap.c_shipped

TTY: create drivers/tty/vt and move the vt code there

2010-11-05 08:16:52 -07:00

defkeymap.map

TTY: create drivers/tty/vt and move the vt code there

2010-11-05 08:16:52 -07:00

keyboard.c

TTY: create drivers/tty/vt and move the vt code there

2010-11-05 08:16:52 -07:00

Makefile

TTY: create drivers/tty/vt and move the vt code there

2010-11-05 08:16:52 -07:00

selection.c

console: rename acquire/release_console_sem() to console_lock/unlock()

2011-01-26 10:50:06 +10:00

vc_screen.c

console: rename acquire/release_console_sem() to console_lock/unlock()

2011-01-26 10:50:06 +10:00

vt_ioctl.c

console: rename acquire/release_console_sem() to console_lock/unlock()

2011-01-26 10:50:06 +10:00

vt.c

Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-02-01 08:05:19 +10:00