From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Aug 2014 22:52:51 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: v3.17-rc1~138
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a45c657f28f82b056173d1afc2e7ed1f1f68829f;p=~emulex%2Finfiniband.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

a45c657f28f82b056173d1afc2e7ed1f1f68829f