From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Jan 2011 23:02:55 +0000 (+1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: v2.6.38-rc3~55
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=01ed875a12eacd5ece370b20ccf8f51543feb172;p=~emulex%2Finfiniband.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/amiga: Fix "debug=mem"
  m68k/atari: Rename "scc" to "atari_scc"
  m68k: Uninline strchr()
---

01ed875a12eacd5ece370b20ccf8f51543feb172