diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 14:25:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 14:25:16 -0400 |
| commit | a724eada8c2a7b62463b73ccf73fd0bb6e928aeb (patch) | |
| tree | 9fbf124022944cba2fdd6aa468f1bad8adc6b2ab /MAINTAINERS | |
| parent | 1b9894f342a39601bb0420b7b8c7e445670c1b51 (diff) | |
| parent | dfdd8cc903288bb2e2ad6731545be3db7304c133 (diff) | |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
* 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
Add MAINTAINERS entry for ARM/INTEL IXP4xx arch support.
ixp4xx: arch_idle() documentation fixup
ixp4xx: timer and clocks cleanups
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8f6297881077..7c1c0b05b298 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -686,6 +686,13 @@ M: Lennert Buytenhek <kernel@wantstofly.org> | |||
| 686 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 686 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 687 | S: Maintained | 687 | S: Maintained |
| 688 | 688 | ||
| 689 | ARM/INTEL IXP4XX ARM ARCHITECTURE | ||
| 690 | M: Imre Kaloz <kaloz@openwrt.org> | ||
| 691 | M: Krzysztof Halasa <khc@pm.waw.pl> | ||
| 692 | L: linux-arm-kernel@lists.infradead.org | ||
| 693 | S: Maintained | ||
| 694 | F: arch/arm/mach-ixp4xx/ | ||
| 695 | |||
| 689 | ARM/INTEL XSC3 (MANZANO) ARM CORE | 696 | ARM/INTEL XSC3 (MANZANO) ARM CORE |
| 690 | M: Lennert Buytenhek <kernel@wantstofly.org> | 697 | M: Lennert Buytenhek <kernel@wantstofly.org> |
| 691 | M: Dan Williams <dan.j.williams@intel.com> | 698 | M: Dan Williams <dan.j.williams@intel.com> |