From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Jul 2021 18:19:57 +0000 (-0700)
Subject: Merge tag 'm68k-for-v5.14-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.14-rc3~19
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1af09ed5ae4d2d3bb3cc2e233f39f52be4147200;p=users%2Fdwmw2%2Flinux.git

Merge tag 'm68k-for-v5.14-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k fix from Geert Uytterhoeven:

 - Fix a Mac defconfig regression due to the IDE -> ATA switch

* tag 'm68k-for-v5.14-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: MAC should select HAVE_PATA_PLATFORM
---

1af09ed5ae4d2d3bb3cc2e233f39f52be4147200