Merge tag 'stm-for-greg-20160714' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Jul 2016 05:19:11 +0000 (14:19 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Jul 2016 05:19:11 +0000 (14:19 +0900)
commit80f76319634fc62befd440b328042dbd54e3b6f8
treee786c2ca89641d38ca5ea90a7a44b2edf57ade14
parent241903641111803807c90016866d88d7ef8c9347
parent7a1a47ce35821b40f5b2ce46379ba14393bc3873
Merge tag 'stm-for-greg-20160714' of git://git./linux/kernel/git/ash/stm into char-misc-next

Alexander writes:

intel_th: Fixes -t://git.kernel.org/pub/scm/linux/kernel/git/ash/stm.git
tags/stm-for-greg-20160714
stable

These are:
 * a fix for a modprobe time deadlock
 * a new PCI ID for Kaby Lake PCH-H
drivers/hwtracing/intel_th/core.c
drivers/hwtracing/intel_th/intel_th.h