From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jan 2011 00:39:23 +0000 (-0800)
Subject: Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: 2.1b_release~5457
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc887b15d935ead2a00aef5779a18034e7c69ee1;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

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

fc887b15d935ead2a00aef5779a18034e7c69ee1
diff --cc MAINTAINERS
index 1af022e,fd05bb7..2e14fd7
--- a/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