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: move .gitignore from drivers/char/ to drivers/tty/vt/ TTY: create drivers/tty/vt and move the vt code there TTY: create drivers/tty and move the tty core files there

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: move .gitignore from drivers/char/ to drivers/tty/vt/ TTY: create drivers/tty/vt and move the vt code there TTY: create drivers/tty and move the tty core files there
5398a64c · Linus Torvalds · 764e028e · 1db01135 · 5398a64c · 5398a64c
Commit 5398a64c authored 14 years ago by Linus Torvalds
--- a/drivers/char/defkeymap.c_shipped
+++ b/drivers/char/defkeymap.c_shipped
--- a/drivers/char/defkeymap.map
+++ b/drivers/char/defkeymap.map
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
--- a/drivers/char/selection.c
+++ b/drivers/char/selection.c
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c