summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-13 00:31:33 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-13 00:31:33 +0400
commit7b799bc82b5eebb8937ff773e4c4be7260698627 (patch)
treedee308dac66195b8bccf847ccfd630c879052f58 /MAINTAINERS
parent8d3ef7461c2460c1bc02c63279b638fae80bba37 (diff)
parentad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (diff)
downloadlinux-7b799bc82b5eebb8937ff773e4c4be7260698627.tar.xz
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f038dca34ee8..a67bf7d315d7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -964,6 +964,13 @@ L: lm-sensors@lm-sensors.org
W: http://www.lm-sensors.nu/
S: Maintained
+HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
+P: Robert Love
+M: rlove@rlove.org
+M: linux-kernel@vger.kernel.org
+W: http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/
+S: Maintained
+
HARMONY SOUND DRIVER
P: Kyle McMartin
M: kyle@parisc-linux.org