diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-15 04:59:35 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-15 04:59:35 +0400 |
| commit | 9cb0ee8576eabb52ad5aad347bf0aaf997975bba (patch) | |
| tree | c0991cb8269632e22f8e80746f005c90780524b1 /drivers/net/ethernet/i825xx/ether1.h | |
| parent | 5b799dde3159284fdee8d60f535e2753a86dbb3f (diff) | |
| parent | eceeb4371240aff22e9a535a2bc57d2311820942 (diff) | |
| download | linux-9cb0ee8576eabb52ad5aad347bf0aaf997975bba.tar.xz | |
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
Diffstat (limited to 'drivers/net/ethernet/i825xx/ether1.h')
0 files changed, 0 insertions, 0 deletions