]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2419036 7a1a47c)
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)
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

1  2 
drivers/hwtracing/intel_th/core.c patch | diff1 | diff2 | blob | history
drivers/hwtracing/intel_th/intel_th.h patch | diff1 | diff2 | blob | history

diff --cc drivers/hwtracing/intel_th/core.c
Simple merge
diff --cc drivers/hwtracing/intel_th/intel_th.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.