commit | 1af09ed5ae4d2d3bb3cc2e233f39f52be4147200 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 23 11:19:57 2021 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 23 11:19:57 2021 -0700 |
tree | 6a0939f120f0bdcafde3d6ab38ea7634a6ee552a | |
parent | ec6badfbe1cde0eb2bec4a0b8f6e738171156b5b [diff] | |
parent | 21ed49265986931b8921a2404394426870245bd2 [diff] |
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