diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-28 16:52:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-28 16:52:47 -0700 |
| commit | c63f887bdae80858c7cebf914f45f69bbaa88e8d (patch) | |
| tree | dd26ff6a3497a2d8f31bdc5045813f072021103e /MAINTAINERS | |
| parent | 21dc2e6c6d552702736ad3603fe9b074654d3932 (diff) | |
| parent | e1632fa2471281c69bb3b6414d2c0fb01c56cc70 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
"Only a couple of small changes.
Improved the m68knommu MAINTAINERS entry to make it clearer which m68k
parts this applies to, and a print format clean up"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: improve m68knommu MAINTAINERS entry
m68k: Use vsprintf %pM extension
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2c7e07c99765..329d05a1ebec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10389,11 +10389,15 @@ S: Maintained F: Documentation/filesystems/ubifs.txt F: fs/ubifs/ -UCLINUX (AND M68KNOMMU) +UCLINUX (M68KNOMMU AND COLDFIRE) M: Greg Ungerer <gerg@uclinux.org> W: http://www.uclinux.org/ +L: linux-m68k@lists.linux-m68k.org L: uclinux-dev@uclinux.org (subscribers-only) +T: git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git S: Maintained +F: arch/m68k/coldfire/ +F: arch/m68k/68*/ F: arch/m68k/*/*_no.* F: arch/m68k/include/asm/*_no.* |