diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-06 16:11:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-06 16:11:34 -0700 |
| commit | acdae9ee6aba82f5bba1fb44325793572db02fbc (patch) | |
| tree | be9b5cd9b62d6bbaedad98034203388b21b06604 /net/can/proc.c | |
| parent | ed66da1104c44bda233930af49d51742dc02b26b (diff) | |
| parent | 946da69954485c4da51c785438f98fb13784941a (diff) | |
| download | op-kernel-dev-acdae9ee6aba82f5bba1fb44325793572db02fbc.zip op-kernel-dev-acdae9ee6aba82f5bba1fb44325793572db02fbc.tar.gz | |
Merge tag 'platform-drivers-x86-v4.13-4' of git://git.infradead.org/linux-platform-drivers-x86
Pull x86 platform driver fix from Darren Hart:
"Fix loop preventing some platforms from waking up via the power button
in s2idle:
- intel-vbtn: match power button on press rather than release"
* tag 'platform-drivers-x86-v4.13-4' of git://git.infradead.org/linux-platform-drivers-x86:
platform/x86: intel-vbtn: match power button on press rather than release
Diffstat (limited to 'net/can/proc.c')
0 files changed, 0 insertions, 0 deletions
