Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Aug 2014 22:52:51 +0000 (15:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Aug 2014 22:52:51 +0000 (15:52 -0700)
Pull m68k changes from Geert Uytterhoeven:
 "Extremely non-spectacular changes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/sun3: Remove define statement no longer needed
  zorro: Use ARRAY_SIZE


Trivial merge