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