diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:15 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:27 -0500 |
| commit | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (patch) | |
| tree | b835312e76fe323de3e1cbbb0d15fca5a3f7ef9c /MAINTAINERS | |
| parent | 2e0e943436912ffe0848ece58167edfe754edb96 (diff) | |
| parent | 0575fb754dbfc32a01f297e778533340a533ec68 (diff) | |
Merge branch 'restart' into for-linus
Conflicts:
arch/arm/mach-exynos/cpu.c
The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0e7a80aefa0..5a70c1809b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1124,13 +1124,6 @@ S: Supported | |||
| 1124 | F: arch/arm/mach-shmobile/ | 1124 | F: arch/arm/mach-shmobile/ |
| 1125 | F: drivers/sh/ | 1125 | F: drivers/sh/ |
| 1126 | 1126 | ||
| 1127 | ARM/TELECHIPS ARM ARCHITECTURE | ||
| 1128 | M: "Hans J. Koch" <hjk@hansjkoch.de> | ||
| 1129 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
| 1130 | S: Maintained | ||
| 1131 | F: arch/arm/plat-tcc/ | ||
| 1132 | F: arch/arm/mach-tcc8k/ | ||
| 1133 | |||
| 1134 | ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT | 1127 | ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT |
| 1135 | M: Lennert Buytenhek <kernel@wantstofly.org> | 1128 | M: Lennert Buytenhek <kernel@wantstofly.org> |
| 1136 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 1129 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |