diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-12 22:59:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-12 22:59:34 -0700 |
commit | 2f1c2b8155865ba3c2909f468ac8be60f52ed56b (patch) | |
tree | d46f8778f176680e64cf8178d20e7c04e84e544d /drivers/ata/ata_piix.c | |
parent | 0ae5eaf1032ca3cd5a0097f72992fc4821c762fa (diff) | |
parent | e424fb8cc4e6634c10f8159b1ff5618cf7bab9c6 (diff) | |
download | linux-3.10-2f1c2b8155865ba3c2909f468ac8be60f52ed56b.tar.gz linux-3.10-2f1c2b8155865ba3c2909f468ac8be60f52ed56b.tar.bz2 linux-3.10-2f1c2b8155865ba3c2909f468ac8be60f52ed56b.zip |
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
Diffstat (limited to 'drivers/ata/ata_piix.c')
0 files changed, 0 insertions, 0 deletions