diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-23 20:19:57 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-23 20:19:57 +0200 |
commit | 1af09ed5ae4d2d3bb3cc2e233f39f52be4147200 (patch) | |
tree | 6a0939f120f0bdcafde3d6ab38ea7634a6ee552a /Documentation/trace/histogram.rst | |
parent | Merge tag 'acpi-5.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff) | |
parent | m68k: MAC should select HAVE_PATA_PLATFORM (diff) | |
download | linux-1af09ed5ae4d2d3bb3cc2e233f39f52be4147200.tar.xz linux-1af09ed5ae4d2d3bb3cc2e233f39f52be4147200.zip |
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
Diffstat (limited to 'Documentation/trace/histogram.rst')
0 files changed, 0 insertions, 0 deletions