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)
commita45c657f28f82b056173d1afc2e7ed1f1f68829f
treed973960f6b70a3ee60a5ee43892ecee2268e4c43
parent489f50be56185fa3492690caedc099d507bf7c98
parent9117710a5997eb078035052800a31b77d47e0e5a
Merge branch 'for-linus' of git://git./linux/kernel/git/geert/linux-m68k

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