Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 295158
b: refs/heads/master
c: 8631d86
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Linus Torvalds committed Mar 23, 2012
1 parent c7b96eb commit b174ade
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 728f5a94a1e1895e87dd802cb5cafaeec7e699e8
refs/heads/master: 8631d86fc4f15e8b456dfccde32d6ba97b075f83
15 changes: 7 additions & 8 deletions trunk/MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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 <James.Bottomley@HansenPartnership.com>
S: Maintained
F: Documentation/mca.txt
F: drivers/mca/
F: include/linux/mca*

MICROTEK X6 SCANNER
M: Oliver Neukum <oliver@neukum.name>
S: Maintained
Expand All @@ -4431,14 +4438,6 @@ S: Supported
F: Documentation/mips/
F: arch/mips/

MISCELLANEOUS MCA-SUPPORT
M: James Bottomley <James.Bottomley@HansenPartnership.com>
S: Maintained
F: Documentation/ia64/mca.txt
F: Documentation/mca.txt
F: drivers/mca/
F: include/linux/mca*

MODULE SUPPORT
M: Rusty Russell <rusty@rustcorp.com.au>
S: Maintained
Expand Down

0 comments on commit b174ade

Please sign in to comment.