From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Mar 2024 17:27:52 +0000 (-0700)
Subject: Merge tag 'm68k-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert... 
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=508f34f2381eb84b2335abb970b940aefef50a19;p=people%2Faperard%2Flinux.git

Merge tag 'm68k-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

 - Make the Zorro bus type constant

 - defconfig updates

* tag 'm68k-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: defconfig: Update defconfigs for v6.8-rc1
  zorro: Make zorro_bus_type const
---

508f34f2381eb84b2335abb970b940aefef50a19