diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 12:09:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 12:09:44 -0400 |
| commit | 255ae3fbd298f312ce47ff0c7ee9bb6ad002e0f0 (patch) | |
| tree | 1152a57dbc1fa85f120f1b6eb57e57e99d3420fa /MAINTAINERS | |
| parent | 89c5a9461d02613c829cf9beffdc3d3c6c3df401 (diff) | |
| parent | b6ef9161e43ad58c3824bd76dc87716276f0cd70 (diff) | |
Merge tag 'metag-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag
Pull metag architecture changes from James Hogan:
- Device tree updates for TZ1090 GPIO drivers merged via GPIO tree.
- Add driver for ImgTec PDC irqchip as found in TZ1090 SoC.
- Add linux-metag mailing list to MAINTAINERS file.
* tag 'metag-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
irq-imgpdc: add ImgTec PDC irqchip driver
MAINTAINERS: add linux-metag mailing list
metag: tz1090: instantiate gpio-tz1090-pdc
metag: tz1090: select and instantiate gpio-tz1090
metag: tz1090: select and instantiate irq-imgpdc
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 99c6f35fb459..233ddce8eeff 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5442,6 +5442,7 @@ F: drivers/watchdog/mena21_wdt.c | |||
| 5442 | 5442 | ||
| 5443 | METAG ARCHITECTURE | 5443 | METAG ARCHITECTURE |
| 5444 | M: James Hogan <james.hogan@imgtec.com> | 5444 | M: James Hogan <james.hogan@imgtec.com> |
| 5445 | L: linux-metag@vger.kernel.org | ||
| 5445 | S: Supported | 5446 | S: Supported |
| 5446 | F: arch/metag/ | 5447 | F: arch/metag/ |
| 5447 | F: Documentation/metag/ | 5448 | F: Documentation/metag/ |