Merge tag 'stm-for-greg-20160420' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --cc MAINTAINERS
Simple merge