]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'm68knommu-for-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Sep 2023 18:34:33 +0000 (11:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Sep 2023 18:34:33 +0000 (11:34 -0700)
commit7a1415eebeece5a27fb40c0242b171c104ad5727
tree68f6115e613162fcb7f49cd2025dfa7a0a448d79
parent68d76d4e7e506664ffb7b28805469ed73044368f
parentcf18ecd34f71dfd2815046d4c0d7b6439bb0cbde
Merge tag 'm68knommu-for-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu updates from Greg Ungerer:
 "Two changes, one a trivial white space clean up, the other removes the
  unnecessary local pcibios_setup() code"

* tag 'm68knommu-for-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: coldfire: dma_timer: ERROR: "foo __init bar" should be "foo __init bar"
  m68k/pci: Drop useless pcibios_setup()