| commit | 97f78c7de8ae38c007fec406d40df99ae62b36de | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 20 10:18:58 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 20 10:18:58 2016 -0700 |
| tree | 72cfab7732f5e60cba75f8d2d1a92ccb5a1fd693 | |
| parent | 4e183d7add15e8bdd131aa14976e26ca3d71a889 [diff] | |
| parent | 9254e70c4ef1fee2e5c43feded4433d19cbb6177 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux Pull s390 fixes from Martin Schwidefsky: "Two more bugs fixes for 4.7: - a KVM regression introduced with the pgtable.c code split - a perf issue with two hardware PMUs using a shared event context" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/cpum_cf: use perf software context for hardware counters KVM: s390/mm: Fix CMMA reset during reboot