Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Oct 2011 07:34:10 +0000 (09:34 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Oct 2011 07:34:10 +0000 (09:34 +0200)
commitcd85b557414fe4cd44ea6608825e96612a5fe2b2
tree8299d2bd75d4516b1c86aea06b296bdd3fcd2044
parent04a8752485e450124f92c9b931d268b48d75650a
parentbc74ee976959616e3c1cc1341383bf2316dd4096
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