diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-28 23:19:53 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-28 23:19:53 +0300 |
commit | 1263193d1a269b87fe96aecfd7d1d5769da77ef6 (patch) | |
tree | bd48cc2e3f70ad5a9c2fb8eda4744d449db96264 /drivers/vfio/pci/vfio_pci.c | |
parent | de182468d1bb726198abaab315820542425270b7 (diff) | |
parent | 5fb73bc2c8301ad106df0e858e60875cd2ae95cb (diff) | |
download | linux-1263193d1a269b87fe96aecfd7d1d5769da77ef6.tar.xz |
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
Diffstat (limited to 'drivers/vfio/pci/vfio_pci.c')
0 files changed, 0 insertions, 0 deletions