]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Mar 2012 05:59:34 +0000 (22:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Mar 2012 05:59:34 +0000 (22:59 -0700)
commit2f1c2b8155865ba3c2909f468ac8be60f52ed56b
treed46f8778f176680e64cf8178d20e7c04e84e544d
parent0ae5eaf1032ca3cd5a0097f72992fc4821c762fa
parente424fb8cc4e6634c10f8159b1ff5618cf7bab9c6
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