diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-24 12:38:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-24 12:38:43 -0800 |
| commit | 0263d4ebd94b36280608e296cba39b924b6e832b (patch) | |
| tree | 6e21b4b3d8e8fb12cdfcfd185d46992487265a9b /include/uapi/rdma/ib_user_cm.h | |
| parent | 19ca2c8fecb1592d623fe5e82d6796f8d446268d (diff) | |
| parent | 7b9e1d89e1b6a3b99a8fdd949aa0f98dd5bf2f6b (diff) | |
Merge tag 'platform-drivers-x86-v4.10-4' of git://git.infradead.org/linux-platform-drivers-x86
Pull x86 platform-driver fixes from Andy Shevchenko:
"This is my first pull request since I become a co-maintainer of
Platform Drivers x86 subsystem. It's a bit bigger than usual due to
material collected for almost two weeks in a row.
MAINTAINERS:
- Add myself to X86 PLATFORM DRIVERS as a co-maintainer
ideapad-laptop:
- handle ACPI event 1
intel_mid_powerbtn:
- Set IRQ_ONESHOT
surface3-wmi:
- fix uninitialized symbol
- Shut up unused-function warning
mlx-platform:
- free first dev on error"
* tag 'platform-drivers-x86-v4.10-4' of git://git.infradead.org/linux-platform-drivers-x86:
MAINTAINERS: Add myself to X86 PLATFORM DRIVERS as a co-maintainer
platform/x86: ideapad-laptop: handle ACPI event 1
platform/x86: intel_mid_powerbtn: Set IRQ_ONESHOT
platform/x86: surface3-wmi: fix uninitialized symbol
platform/x86: surface3-wmi: Shut up unused-function warning
platform/x86: mlx-platform: free first dev on error
Diffstat (limited to 'include/uapi/rdma/ib_user_cm.h')