From: Linus Torvalds Date: Mon, 30 Jul 2012 18:54:53 +0000 (-0700) Subject: Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86 X-Git-Tag: accepted/tizen/common/20141203.182822~4067 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d3d09b01a028e9dd1282149fdcd2a6e0edd73e4;p=platform%2Fkernel%2Flinux-arm64.git Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86 Pull x86 platform driver updates from Matthew Garrett: "Nothing overly dramatic here - improved support for the Classmate, some random small fixes and a rework of backlight management to deal with some of the more awkward cases." * 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86: thinkpad_acpi: Free hotkey_keycode_map after unregistering tpacpi_inputdev thinkpad_acpi: Fix a memory leak during module exit thinkpad_acpi: Flush the workqueue before freeing tpacpi_leds dell-laptop: Add 6 machines to touchpad led quirk ACER: Fix Smatch double-free issue ACER: Fix up sparse warning asus-nb-wmi: add some video toggle keys asus-nb-wmi: add wapf quirk for ASUS machines classmate-laptop: Fix extra keys hardware id. classmate-laptop: Add support for Classmate V4 accelerometer. asus-wmi: enable resume on lid open asus-wmi: control backlight power through WMI, not ACPI samsung-laptop: support R40/R41 acpi/video_detect: blacklist samsung x360 samsung-laptop: X360 ACPI backlight device is broken drivers-platform-x86: use acpi_video_dmi_promote_vendor() acpi: add a way to promote/demote vendor backlight drivers ACER: Add support for accelerometer sensor asus-wmi: use ASUS_WMI_METHODID_DSTS2 as default DSTS ID. --- 7d3d09b01a028e9dd1282149fdcd2a6e0edd73e4