From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 Sep 2012 00:59:35 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
X-Git-Tag: firefly_0821_release~3680^2~2086
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9cb0ee8576eabb52ad5aad347bf0aaf997975bba;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

Pull x86 platform driver updates from Matthew Garrett:
 "A few small updates for 3.6 - a trivial regression fix and a couple of
  conformance updates for the gmux driver, plus some tiny fixes for
  asus-wmi, eeepc-laptop and thinkpad_acpi."

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
  thinkpad_acpi: buffer overflow in fan_get_status()
  eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug()
  platform/x86: fix asus_laptop.wled_type description
  asus-laptop: HRWS/HWRS typo
  drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO
  apple-gmux: Fix port address calculation in gmux_pio_write32()
  apple-gmux: Fix index read functions
  apple-gmux: Obtain version info from indexed gmux
---

9cb0ee8576eabb52ad5aad347bf0aaf997975bba