From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Apr 2010 15:43:59 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v5.15~29798
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c81eddb0e3728661d1585fbc564449c94165cc36;p=mirror_ubuntu-kernels.git

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] zcore: Fix reipl device detection
  [S390] vdso: use ntp adjusted clock multiplier
  [S390] cio: use exception-save stsch
  [S390] add hook to reenable mss after hibernation
  [S390] cio: allow enable_facility from outside init functions
  [S390] dasd: fix endless loop in erp
---

c81eddb0e3728661d1585fbc564449c94165cc36