diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 16:43:01 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 16:43:01 -0400 |
| commit | 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b (patch) | |
| tree | 110d24e6394dbd98cb33d80a5587cd18c8315e0b /MAINTAINERS | |
| parent | a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3 (diff) | |
| parent | 938870491f0cad030b358af47e28d124b72702d1 (diff) | |
Merge branch 'pxa-tosa' into pxa
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3b228e2d12e..20aef952782 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -584,6 +584,8 @@ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) | |||
| 584 | S: Maintained | 584 | S: Maintained |
| 585 | 585 | ||
| 586 | ARM/TOSA MACHINE SUPPORT | 586 | ARM/TOSA MACHINE SUPPORT |
| 587 | P: Dmitry Baryshkov | ||
| 588 | M: dbaryshkov@gmail.com | ||
| 587 | P: Dirk Opfer | 589 | P: Dirk Opfer |
| 588 | M: dirk@opfer-online.de | 590 | M: dirk@opfer-online.de |
| 589 | S: Maintained | 591 | S: Maintained |