diff options
| author | Linus Torvalds <[email protected]> | 2015-07-05 10:54:09 -0700 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2015-07-05 10:54:09 -0700 | 
| commit | a585d2b738bfa26326b3f1f40f0f1eda0c067ccf (patch) | |
| tree | dcf3289b576b1c8697f2a2d46909d36104208ba3 /arch/arm/include/asm/assembler.h | |
| parent | 1dc51b8288007753ad7cd7d08bb8fa930fc8bb10 (diff) | |
| parent | 0a8b83530b6f67b9a50bd7937d57a5deea187b5b (diff) | |
Merge tag 'platform-drivers-x86-v4.2-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
Pull late x86 platform driver updates from Darren Hart:
 "The following came in a bit later and I wanted them to bake in next a
  few more days before submitting, thus the second pull.
  A new intel_pmc_ipc driver, a symmetrical allocation and free fix in
  dell-laptop, a couple minor fixes, and some updated documentation in
  the dell-laptop comments.
  intel_pmc_ipc:
   - Add Intel Apollo Lake PMC IPC driver
  tc1100-wmi:
   - Delete an unnecessary check before the function call "kfree"
  dell-laptop:
   - Fix allocating & freeing SMI buffer page
   - Show info about WiGig and UWB in debugfs
   - Update information about wireless control"
* tag 'platform-drivers-x86-v4.2-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  intel_pmc_ipc: Add Intel Apollo Lake PMC IPC driver
  tc1100-wmi: Delete an unnecessary check before the function call "kfree"
  dell-laptop: Fix allocating & freeing SMI buffer page
  dell-laptop: Show info about WiGig and UWB in debugfs
  dell-laptop: Update information about wireless control
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
0 files changed, 0 insertions, 0 deletions