Merge tag 'platform-drivers-x86-v4.1-3' of git://git.infradead.org/users/dvhart/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 May 2015 20:19:53 +0000 (13:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 May 2015 20:19:53 +0000 (13:19 -0700)
commit1263193d1a269b87fe96aecfd7d1d5769da77ef6
treebd48cc2e3f70ad5a9c2fb8eda4744d449db96264
parentde182468d1bb726198abaab315820542425270b7
parent5fb73bc2c8301ad106df0e858e60875cd2ae95cb
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