From b174ade48c756ebe5b111f85904e154baa8b2545 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 23 Mar 2012 15:01:57 -0700 Subject: [PATCH] --- yaml --- r: 295158 b: refs/heads/master c: 8631d86fc4f15e8b456dfccde32d6ba97b075f83 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index d93f776eb042..223c716b1326 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 728f5a94a1e1895e87dd802cb5cafaeec7e699e8 +refs/heads/master: 8631d86fc4f15e8b456dfccde32d6ba97b075f83 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 95eba3135018..6cb07e493688 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4416,6 +4416,13 @@ T: git git://git.monstr.eu/linux-2.6-microblaze.git S: Supported F: arch/microblaze/ +MICROCHANNEL ARCHITECTURE (MCA) +M: James Bottomley +S: Maintained +F: Documentation/mca.txt +F: drivers/mca/ +F: include/linux/mca* + MICROTEK X6 SCANNER M: Oliver Neukum S: Maintained @@ -4431,14 +4438,6 @@ S: Supported F: Documentation/mips/ F: arch/mips/ -MISCELLANEOUS MCA-SUPPORT -M: James Bottomley -S: Maintained -F: Documentation/ia64/mca.txt -F: Documentation/mca.txt -F: drivers/mca/ -F: include/linux/mca* - MODULE SUPPORT M: Rusty Russell S: Maintained