tree 30daa1c9bafbf179047047c67d11ccd98e27d809
parent 466c19063b4b426d5c362572787cb249fbf4296b
parent df6212529c646710502657b18d8f42927f3dda81
author Linus Torvalds <torvalds@linux-foundation.org> 1295570363 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1295570363 -0800

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: update MAINTAINERS file due to driver movement
  tty: move drivers/serial/ to drivers/tty/serial/
  tty: move hvc drivers to drivers/tty/hvc/