aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@linux.vnet.ibm.com>2007-10-11 08:45:20 -0400
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2007-10-11 08:45:20 -0400
commit0a2cdd88f0b8ea98bcaf9712446cc46a240313f5 (patch)
tree05f2ac8731a0b24bba1552458839b1c7d032ff63 /MAINTAINERS
parentcdec12aebe1b10aa58bebaa05bb697843154f7f9 (diff)
parent17c5c2093624e81acda16fb737e4679750addd7a (diff)
Merge branch 'virtex-for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-virtex into for-2.6.24-4xx
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d47367f68406..4dbfa738b7ea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2306,7 +2306,7 @@ S: Maintained
2306LINUX FOR POWERPC EMBEDDED XILINX VIRTEX 2306LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
2307P: Grant Likely 2307P: Grant Likely
2308M: grant.likely@secretlab.ca 2308M: grant.likely@secretlab.ca
2309W: http://www.secretlab.ca/ 2309W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
2310L: linuxppc-dev@ozlabs.org 2310L: linuxppc-dev@ozlabs.org
2311S: Maintained 2311S: Maintained
2312 2312