]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 798bb34 63a24cf)
Merge tag 'm68knommu-for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Nov 2024 22:47:58 +0000 (14:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Nov 2024 22:47:58 +0000 (14:47 -0800)
Pull m68knommu updates from Greg Ungerer:

 - only include FEC platform entries when hardware supports it

 - fix typo in ifdef config name

* tag 'm68knommu-for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: coldfire/device.c: only build FEC when HW macros are defined
  m68k: mcfgpio: Fix incorrect register offset for CONFIG_M5441x


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.