pci-dma: cris: use include/linux/pci-dma.h

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e0d5c1a..b2403eb 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -968,6 +968,13 @@ W: http://www.arm.linux.org.uk/
 S:     Maintained
 F:     arch/arm/vfp/
 
+ASC7621 HARDWARE MONITOR DRIVER
+M:     George Joseph <george.joseph@fairview5.com>
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+F:     Documentation/hwmon/asc7621
+F:     drivers/hwmon/asc7621.c
+
 ASUS ACPI EXTRAS DRIVER
 M:     Corentin Chary <corentincj@iksaif.net>
 M:     Karol Kozimor <sziwan@users.sourceforge.net>
@@ -1228,6 +1235,13 @@ W:       http://blackfin.uclinux.org
 S:     Supported
 F:     drivers/rtc/rtc-bfin.c
 
+BLACKFIN SDH DRIVER
+M:     Cliff Cai <cliff.cai@analog.com>
+L:     uclinux-dist-devel@blackfin.uclinux.org
+W:     http://blackfin.uclinux.org
+S:     Supported
+F:     drivers/mmc/host/bfin_sdh.c
+
 BLACKFIN SERIAL DRIVER
 M:     Sonic Zhang <sonic.zhang@analog.com>
 L:     uclinux-dist-devel@blackfin.uclinux.org
@@ -2797,7 +2811,7 @@ S:        Maintained
 F:     drivers/input/
 
 INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
-M:     Sylvain Meyer <sylvain.meyer@worldonline.fr>
+M:     Maik Broemme <mbroemme@plusserver.de>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
 F:     Documentation/fb/intelfb.txt
@@ -3048,6 +3062,13 @@ W:       http://www.melware.de
 S:     Maintained
 F:     drivers/isdn/hardware/eicon/
 
+IT87 HARDWARE MONITORING DRIVER
+M:     Jean Delvare <khali@linux-fr.org>
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+F:     Documentation/hwmon/it87
+F:     drivers/hwmon/it87.c
+
 IVTV VIDEO4LINUX DRIVER
 M:     Andy Walls <awalls@radix.net>
 L:     ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
@@ -3436,6 +3457,13 @@ S:       Maintained
 F:     Documentation/ldm.txt
 F:     fs/partitions/ldm.*
 
+LogFS
+M:     Joern Engel <joern@logfs.org>
+L:     logfs@logfs.org
+W:     logfs.org
+S:     Maintained
+F:     fs/logfs/
+
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 M:     Eric Moore <Eric.Moore@lsi.com>
 M:     support@lsi.com
@@ -3600,7 +3628,7 @@ F:        mm/
 
 MEMORY RESOURCE CONTROLLER
 M:     Balbir Singh <balbir@linux.vnet.ibm.com>
-M:     Pavel Emelyanov <xemul@openvz.org>
+M:     Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
 M:     KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
 L:     linux-mm@kvack.org
 S:     Maintained