From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Dec 2012 18:06:00 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v6.6-pxa1908~26400
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=7b077868cb8bc31aa5a0dad961ecc9f157bff744;p=linux.git

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
---

7b077868cb8bc31aa5a0dad961ecc9f157bff744