diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-01 10:50:01 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-01 10:50:01 -0800 |
commit | 8da5db7ddae1bed11e81ff419496cdea0ad77791 (patch) | |
tree | 96ddd3015d93b04ad6702662ccb8652e9a9090cc /fs/ubifs/file.c | |
parent | 7e30309968c18b504320275d527914272fbe1a1c (diff) | |
parent | 1cedc6385d5f7310af0a08831c6c4303486ba850 (diff) | |
download | op-kernel-dev-8da5db7ddae1bed11e81ff419496cdea0ad77791.zip op-kernel-dev-8da5db7ddae1bed11e81ff419496cdea0ad77791.tar.gz |
Merge tag 'platform-drivers-x86-v4.16-5' of git://git.infradead.org/linux-platform-drivers-x86
Pull x86 platform drivers fixes from Andy Shevchenko:
- fix a regression on laptops like Dell XPS 9360 where keyboard stopped
working.
- correct sysfs wakeup attribute after removal of some drivers to
reflect that they are not able to wake system up anymore.
* tag 'platform-drivers-x86-v4.16-5' of git://git.infradead.org/linux-platform-drivers-x86:
platform/x86: wmi: Fix misuse of vsprintf extension %pULL
platform/x86: intel-hid: Reset wakeup capable flag on removal
platform/x86: intel-vbtn: Reset wakeup capable flag on removal
platform/x86: intel-vbtn: Only activate tablet mode switch on 2-in-1's
Diffstat (limited to 'fs/ubifs/file.c')
0 files changed, 0 insertions, 0 deletions