Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 00:39:23 +0000 (16:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 00:39:23 +0000 (16:39 -0800)
commitfc887b15d935ead2a00aef5779a18034e7c69ee1
tree30daa1c9bafbf179047047c67d11ccd98e27d809
parent466c19063b4b426d5c362572787cb249fbf4296b
parentdf6212529c646710502657b18d8f42927f3dda81
Merge branch 'tty-linus' of git://git./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/
MAINTAINERS
drivers/Makefile
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/samsung.c
drivers/tty/serial/sh-sci.c
drivers/tty/serial/sh-sci.h