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)
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


Trivial merge