tree f932739bc9c869a3acc037e2317ed2dd0baba664
parent dfdebc24837ed0a1d6ad73b108a10d3c88d1b6e8
parent 509d97b6f91b51e180ba26ddb1e2b7f6dfa80cba
author Linus Torvalds <torvalds@linux-foundation.org> 1358441790 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1358441790 -0800

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