tree ae3c668c3247df18db0a293cbcfad4a9e53d0fd7
parent 764e028e24d33f6e375d2a5df450c9d0180fbc00
parent 1db01135df7aa8b456e093a781f1d7f7016ec01e
author Linus Torvalds <torvalds@linux-foundation.org> 1289242529 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1289242529 -0800

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