projects / profile / ivi / kernel-adaptation-intel-automotive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 16e024f 1f1c961)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Dec 2012 18:06:00 +0000 (10:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Dec 2012 18:06:00 +0000 (10:06 -0800)
commit7b077868cb8bc31aa5a0dad961ecc9f157bff744
tree02edce8760040ab5c15c242eb648fb3a342c58d7tree | snapshot
parent16e024f30ce96ef5fa651e2914e19d175a924cabcommit | diff
parent1f1c96102ff848778cd596e81bdbd45f81a40119commit | diff
Merge branch 'for-linus' of git://git./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
Domain: System / Uncategorized;