From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Mar 2012 05:59:34 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2f1c2b8155865ba3c2909f468ac8be60f52ed56b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

Pull x86 platfrm driver fixes from Matthew Garrett:
 "Some trivial patches that fix wifi on some Lenovos and avoid a
  potential memory corruption issue on some Panasonics, plus two
  straightforward new drivers that touch no existing code."

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
  panasonic-laptop: avoid overflow in acpi_pcc_hotkey_add()
  acer-wmi: No wifi rfkill on Lenovo machines
  Fujitsu tablet extras driver
  x86: Add amilo-rfkill driver for some Fujitsu-Siemens Amilo laptops
---

2f1c2b8155865ba3c2909f468ac8be60f52ed56b