diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-23 17:17:43 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-23 17:17:43 +0100 |
commit | b704836bc778d69d2236e18aa7c10ae8ad78eb7d (patch) | |
tree | 22f0cb07c92c79da854266a8c5d5ad907e8d5996 /MAINTAINERS | |
parent | db811b97dd11cd1aa6d751e7d02fa73dc7b2ad4b (diff) | |
parent | 9f3a6284880ceea452903e2043c88d7226736318 (diff) | |
download | lwn-b704836bc778d69d2236e18aa7c10ae8ad78eb7d.tar.gz lwn-b704836bc778d69d2236e18aa7c10ae8ad78eb7d.zip |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rt/head
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4c8f49fb89bf..dc01317d0308 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -616,10 +616,10 @@ M: Richard Purdie <rpurdie@rpsys.net> S: Maintained ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE -M: Paulius Zaleckas <paulius.zaleckas@teltonika.lt> +M: Paulius Zaleckas <paulius.zaleckas@gmail.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://gitorious.org/linux-gemini/mainline.git -S: Maintained +S: Odd Fixes F: arch/arm/mach-gemini/ ARM/EBSA110 MACHINE SUPPORT @@ -641,9 +641,9 @@ T: topgit git://git.openezx.org/openezx.git F: arch/arm/mach-pxa/ezx.c ARM/FARADAY FA526 PORT -M: Paulius Zaleckas <paulius.zaleckas@teltonika.lt> +M: Paulius Zaleckas <paulius.zaleckas@gmail.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained +S: Odd Fixes F: arch/arm/mm/*-fa* ARM/FOOTBRIDGE ARCHITECTURE |