| commit | 7b077868cb8bc31aa5a0dad961ecc9f157bff744 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 18 10:06:00 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 18 10:06:00 2012 -0800 |
| tree | 02edce8760040ab5c15c242eb648fb3a342c58d7 | |
| parent | 16e024f30ce96ef5fa651e2914e19d175a924cab [diff] | |
| parent | 1f1c96102ff848778cd596e81bdbd45f81a40119 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux Pull s390 update #2 from Martin Schwidefsky: "The main patch is the function measurement blocks extension for PCI to do performance statistics and help with debugging. The other patch is a small cleanup in ccwdev.h." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/ccwdev: Include asm/schid.h. s390/pci: performance statistics and debug infrastructure