From: Linus Torvalds Date: Mon, 8 Nov 2010 18:55:29 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 X-Git-Tag: v2.6.37-rc2~76 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5398a64c63a69a0ac33dbae458ea4aab0dc23f14;p=linux-pvops.git 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 --- 5398a64c63a69a0ac33dbae458ea4aab0dc23f14