From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Aug 2010 21:13:35 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: v5.15~28513
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a92b166e6b8c3c0037493690b2800b0b0dd92063;p=mirror_ubuntu-kernels.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:
  zorro: Fix reading of proc/bus/zorro/* in small chunks
  zorro: BKL removal
  m68k/mac: Fix RTC on PMU machines
  m68k/mac: Add color classic ii support
  arch/m68k/sun3/leds.c: Checkpatch cleanup
---

a92b166e6b8c3c0037493690b2800b0b0dd92063