From: Linus Torvalds Date: Thu, 28 May 2015 20:19:53 +0000 (-0700) Subject: Merge tag 'platform-drivers-x86-v4.1-3' of git://git.infradead.org/users/dvhart/linux... X-Git-Tag: Ubuntu-5.10.0-12.13~14733 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1263193d1a269b87fe96aecfd7d1d5769da77ef6;p=mirror_ubuntu-hirsute-kernel.git Merge tag 'platform-drivers-x86-v4.1-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86 Pull x86 platform driver fix from Darren Hart: "thinkpad_acpi: Revert unintentional device attribute renaming" * tag 'platform-drivers-x86-v4.1-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: thinkpad_acpi: Revert unintentional device attribute renaming --- 1263193d1a269b87fe96aecfd7d1d5769da77ef6