From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Jul 2009 19:16:38 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: Ubuntu-5.2.0-15.16~28602
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=760dcc6e1839e7ca82507698fb077d5d78b24964;p=mirror_ubuntu-eoan-kernel.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] zcrypt: fix scheduling of hrtimer ap_poll_timer
  [S390] vdso: clock_gettime of CLOCK_THREAD_CPUTIME_ID with noexec=on
  [S390] vdso: fix per cpu area allocation
  [S390] hibernation: fix register corruption on machine checks
  [S390] hibernation: fix lowcore handling
---

760dcc6e1839e7ca82507698fb077d5d78b24964