diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-26 23:24:39 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-26 23:24:39 -0700 |
commit | 2fc5ddaa3f1f1d7a1f7f455e287e97bf298ab8d7 (patch) | |
tree | 32eaac100f3771da334173fa9e5a63193463f24b /MAINTAINERS | |
parent | 7553c7e68fd144643e74a279ef51b74a15214071 (diff) | |
parent | aaa3ca82286d53c5409d2c22204426c9ca419d8c (diff) | |
download | talos-obmc-linux-2fc5ddaa3f1f1d7a1f7f455e287e97bf298ab8d7.tar.gz talos-obmc-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-- | MAINTAINERS | 1 |
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 |