Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

* '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/

diff --cc MAINTAINERS
index 1af022e63668fd0c024292ba82515b39a89d83b0,fd05bb773494570559066529ecd21adc94575d8e..2e14fd74d48c066bba8a39cbc8a444f3deca7197
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3527,15 -3505,8 +3527,15 @@@ JSM Neo PCI based serial car
  M:    Breno Leitao <leitao@linux.vnet.ibm.com>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
- F:    drivers/serial/jsm/
+ F:    drivers/tty/serial/jsm/
  
 +K10TEMP HARDWARE MONITORING DRIVER
 +M:    Clemens Ladisch <clemens@ladisch.de>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    Documentation/hwmon/k10temp
 +F:    drivers/hwmon/k10temp.c
 +
  K8TEMP HARDWARE MONITORING DRIVER
  M:    Rudolf Marek <r.marek@assembler.cz>
  L:    lm-sensors@lm-sensors.org

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/tty/serial/atmel_serial.c
Simple merge

diff --cc drivers/tty/serial/samsung.c
Simple merge

diff --cc drivers/tty/serial/sh-sci.c
Simple merge

diff --cc drivers/tty/serial/sh-sci.h
Simple merge