From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 21 Feb 2021 03:17:35 +0000 (-0800)
Subject: Merge tag 'x86_platform_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~1790
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f7a4028d8b48d1dc6b51b0737087f5e3c16c336;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'x86_platform_for_v5.12' of git://git./linux/kernel/git/tip/tip

Pull x86 platform updates from Borislav Petkov:

 - Convert geode drivers to look up the LED controls from a GPIO machine
   descriptor table.

 - Remove arch/x86/platform/goldfish as it is not used by the android
   emulator anymore.

* tag 'x86_platform_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/geode: Convert alix LED to GPIO machine descriptor
  x86/platform/geode: Convert geode LED to GPIO machine descriptor
  x86/platform/geode: Convert net5501 LED to GPIO machine descriptor
  x86/platform: Retire arch/x86/platform/goldfish
  x86/platform/intel-mid: Convert comma to semicolon
---

4f7a4028d8b48d1dc6b51b0737087f5e3c16c336