Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Jun 2015 23:52:47 +0000 (16:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Jun 2015 23:52:47 +0000 (16:52 -0700)
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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge