Merge tag 'stm-for-greg-20161118' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Nov 2016 07:49:30 +0000 (08:49 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Nov 2016 07:49:30 +0000 (08:49 +0100)
commit38d1790644ef781c2b883dea68c8f6ba4e60e2f2
tree0352052a9f81381232a92722c9c6515387595a88
parent7c7a6077f5c7a35fc03a7f452875d8440dd1bc8d
parentee01aebbe2c4c196142bdb8074812dfe44830725
Merge tag 'stm-for-greg-20161118' of git://git./linux/kernel/git/ash/stm into char-misc-next

Alexander writes:

stm class/intel_th: Updates for 4.10

These are:
  * Fix for an error-path leak in stm
  * Host-driven mode in intel_th
  * Documentation and other small updates