From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Jan 2013 16:56:30 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v3.8-rc4~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=72ffaa48e11fe40d96e70bd24289b5e2b8807297;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull more s390 patches from Martin Schwidefsky:
 "A couple of bug fixes: one of the transparent huge page primitives is
  broken, the sched_clock function overflows after 417 days, the XFS
  module has grown too large for -fpic and the new pci code has broken
  normal channel subsystem notifications."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/chsc: fix SEI usage
  s390/time: fix sched_clock() overflow
  s390: use -fPIC for module compile
  s390/mm: fix pmd_pfn() for thp
---

72ffaa48e11fe40d96e70bd24289b5e2b8807297