summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-27 08:24:39 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-27 08:24:39 +0200
commit2fc5ddaa3f1f1d7a1f7f455e287e97bf298ab8d7 (patch)
tree32eaac100f3771da334173fa9e5a63193463f24b /MAINTAINERS
parentMerge 4.6-rc4 into char-misc-next (diff)
parentintel_th: pci: Add Broxton-M SOC support (diff)
downloadlinux-2fc5ddaa3f1f1d7a1f7f455e287e97bf298ab8d7.tar.xz
linux-2fc5ddaa3f1f1d7a1f7f455e287e97bf298ab8d7.zip
Merge tag 'stm-for-greg-20160420' of git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm into char-misc-next
Alexander writes: stm class/intel_th: Updates for 4.7 These are: * Intel TH/MSU: improved resource handling and releasing * Intel TH/MSU: rehashed locking around buffer accesses * Intel TH/outputs: better sysfs group handling * Intel TH, STM: various bugfixes and smaller improvements * Intel TH: added a PCI ID for Broxton-M SOC
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1d5b4becab6f..6d59a9d34c44 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9754,6 +9754,7 @@ F: drivers/mmc/host/dw_mmc*
SYSTEM TRACE MODULE CLASS
M: Alexander Shishkin <alexander.shishkin@linux.intel.com>
S: Maintained
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm.git
F: Documentation/trace/stm.txt
F: drivers/hwtracing/stm/
F: include/linux/stm.h