diff options
author | David S. Miller <davem@davemloft.net> | 2011-08-20 13:39:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-20 13:39:12 -0400 |
commit | 823dcd2506fa369aeb8cbd26da5663efe2fda9a9 (patch) | |
tree | 853b3e3c05f0b9ee1b5df8464db19b7acc57150c /MAINTAINERS | |
parent | eaa36660de7e174498618d69d7277d44a2f24c3d (diff) | |
parent | 98e77438aed3cd3343cbb86825127b1d9d2bea33 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fd474a05cbaf..d32e1ca5ba73 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3898,9 +3898,9 @@ F: arch/powerpc/platforms/powermac/ | |||
3898 | F: drivers/macintosh/ | 3898 | F: drivers/macintosh/ |
3899 | 3899 | ||
3900 | LINUX FOR POWERPC EMBEDDED MPC5XXX | 3900 | LINUX FOR POWERPC EMBEDDED MPC5XXX |
3901 | M: Grant Likely <grant.likely@secretlab.ca> | 3901 | M: Anatolij Gustschin <agust@denx.de> |
3902 | L: linuxppc-dev@lists.ozlabs.org | 3902 | L: linuxppc-dev@lists.ozlabs.org |
3903 | T: git git://git.secretlab.ca/git/linux-2.6.git | 3903 | T: git git://git.denx.de/linux-2.6-agust.git |
3904 | S: Maintained | 3904 | S: Maintained |
3905 | F: arch/powerpc/platforms/512x/ | 3905 | F: arch/powerpc/platforms/512x/ |
3906 | F: arch/powerpc/platforms/52xx/ | 3906 | F: arch/powerpc/platforms/52xx/ |
@@ -7351,7 +7351,7 @@ THE REST | |||
7351 | M: Linus Torvalds <torvalds@linux-foundation.org> | 7351 | M: Linus Torvalds <torvalds@linux-foundation.org> |
7352 | L: linux-kernel@vger.kernel.org | 7352 | L: linux-kernel@vger.kernel.org |
7353 | Q: http://patchwork.kernel.org/project/LKML/list/ | 7353 | Q: http://patchwork.kernel.org/project/LKML/list/ |
7354 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git | 7354 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git |
7355 | S: Buried alive in reporters | 7355 | S: Buried alive in reporters |
7356 | F: * | 7356 | F: * |
7357 | F: */ | 7357 | F: */ |