From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Oct 2011 07:34:10 +0000 (+0200)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: firefly_0821_release~3680^2~4335
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cd85b557414fe4cd44ea6608825e96612a5fe2b2;p=firefly-linux-kernel-4.4.55.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Finally remove leftover markers sections
  m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC
  m68k/mac: Fix compiler warning in via_read_time()
  zorro: Fix four checkpatch warnings
---

cd85b557414fe4cd44ea6608825e96612a5fe2b2