From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Nov 2024 22:47:58 +0000 (-0800)
Subject: Merge tag 'm68knommu-for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: microblaze-v6.16~534
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=7ebe7afed716391a9831de8adc910fff65001ef2;p=linux-2.6-microblaze.git

Merge tag 'm68knommu-for-v6.13' of git://git./linux/kernel/git/gerg/m68knommu

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
---

7ebe7afed716391a9831de8adc910fff65001ef2