summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-21 16:36:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-21 16:36:46 -0700
commite9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b (patch)
treec676609730533fc1b7c5e01992e46b6eaf75f99b /MAINTAINERS
parent548453fd107f789f5f1bc2dc13cc432ceb3b5efd (diff)
parent838cb6aba4cebcf4fcd06b90e2adf890bef884ac (diff)
downloadlinux-e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b.tar.gz
linux-e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b.tar.bz2
linux-e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits) DOC: A couple corrections and clarifications in USB doc. Generate a slightly more informative error msg for bad HZ fix typo "is" -> "if" in Makefile ext*: spelling fix prefered -> preferred DOCUMENTATION: Use newer DEFINE_SPINLOCK macro in docs. KEYS: Fix the comment to match the file name in rxrpc-type.h. RAID: remove trailing space from printk line DMA engine: typo fixes Remove unused MAX_NODES_SHIFT MAINTAINERS: Clarify access to OCFS2 development mailing list. V4L: Storage class should be before const qualifier (sn9c102) V4L: Storage class should be before const qualifier sonypi: Storage class should be before const qualifier intel_menlow: Storage class should be before const qualifier DVB: Storage class should be before const qualifier arm: Storage class should be before const qualifier ALSA: Storage class should be before const qualifier acpi: Storage class should be before const qualifier firmware_sample_driver.c: fix coding style MAINTAINERS: Add ati_remote2 driver ... Fixed up trivial conflicts in firmware_sample_driver.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 6 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 525d09b48801..c0cc52a9afe5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -684,6 +684,11 @@ L: linux-wireless@vger.kernel.org
L: ath5k-devel@lists.ath5k.org
S: Maintained
+ATI_REMOTE2 DRIVER
+P: Ville Syrjala
+M: syrjala@sci.fi
+S: Maintained
+
ATL1 ETHERNET DRIVER
P: Jay Cliburn
M: jcliburn@gmail.com
@@ -2947,7 +2952,7 @@ P: Mark Fasheh
M: mfasheh@suse.com
P: Joel Becker
M: joel.becker@oracle.com
-L: ocfs2-devel@oss.oracle.com
+L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
W: http://oss.oracle.com/projects/ocfs2/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
S: Supported