mm: wrap get_locked_pte() using __cond_lock()

[net-next-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ebb9f9e8b583883a529b27bc3fa26a6772ec4093..146b8a068a4ea60813f2e6ce8fa1df0bb80bade0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2645,10 +2645,10 @@ F:      drivers/net/greth*
 
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 M:     Frank Seidel <frank@f-seidel.de>
-L:     lm-sensors@lm-sensors.org
+L:     platform-driver-x86@vger.kernel.org
 W:     http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 S:     Maintained
-F:     drivers/hwmon/hdaps.c
+F:     drivers/platform/x86/hdaps.c
 
 HWPOISON MEMORY FAILURE HANDLING
 M:     Andi Kleen <andi@firstfloor.org>
@@ -3765,6 +3765,13 @@ L:       linux-scsi@vger.kernel.org
 S:     Maintained
 F:     drivers/scsi/sym53c8xx_2/
 
+LTC4261 HARDWARE MONITOR DRIVER
+M:     Guenter Roeck <linux@roeck-us.net>
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+F:     Documentation/hwmon/ltc4261
+F:     drivers/hwmon/ltc4261.c
+
 LTP (Linux Test Project)
 M:     Rishikesh K Rajak <risrajak@linux.vnet.ibm.com>
 M:     Garrett Cooper <yanegomi@gmail.com>
@@ -5388,8 +5395,8 @@ F:        drivers/*/*s3c2410*
 F:     drivers/*/*/*s3c2410*
 
 TI DAVINCI MACHINE SUPPORT
-P:     Kevin Hilman
-M:     davinci-linux-open-source@linux.davincidsp.com
+M:     Kevin Hilman <khilman@deeprootsystems.com>
+L:     davinci-linux-open-source@linux.davincidsp.com (subscribers-only)
 Q:     http://patchwork.kernel.org/project/linux-davinci/list/
 S:     Supported
 F:     arch/arm/mach-davinci