diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 19:15:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 19:15:31 -0400 |
| commit | 4496d937a518fde0d0e1980e4ab470cedb4b50cd (patch) | |
| tree | a02d57e13b44483417973a306f9fd23743959375 /MAINTAINERS | |
| parent | 8e9d2089723d08d51e66c5eea49253d76e27941e (diff) | |
| parent | 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: irq_node.handler() should return irqreturn_t
m68k: section mismatch fixes: Atari SCSI
m68k: section mismatch fixes: DMAsound for Atari
MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository
m68k: mac - Add SWIM floppy support
m68k: mac - Add a new entry in mac_model to identify the floppy controller type.
m68k: Add install target
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4dacdfcdbe6e..fa7be04b0cf0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2845,7 +2845,7 @@ P: Roman Zippel | |||
| 2845 | M: zippel@linux-m68k.org | 2845 | M: zippel@linux-m68k.org |
| 2846 | L: linux-m68k@lists.linux-m68k.org | 2846 | L: linux-m68k@lists.linux-m68k.org |
| 2847 | W: http://www.linux-m68k.org/ | 2847 | W: http://www.linux-m68k.org/ |
| 2848 | W: http://linux-m68k-cvs.ubb.ca/ | 2848 | T: git git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git |
| 2849 | S: Maintained | 2849 | S: Maintained |
| 2850 | 2850 | ||
| 2851 | M68K ON APPLE MACINTOSH | 2851 | M68K ON APPLE MACINTOSH |