Merge tag 'm68k-for-v5.14-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Jul 2021 18:19:57 +0000 (11:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Jul 2021 18:19:57 +0000 (11:19 -0700)
commit1af09ed5ae4d2d3bb3cc2e233f39f52be4147200
tree6a0939f120f0bdcafde3d6ab38ea7634a6ee552a
parentec6badfbe1cde0eb2bec4a0b8f6e738171156b5b
parent21ed49265986931b8921a2404394426870245bd2
Merge tag 'm68k-for-v5.14-tag2' of git://git./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