From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Jul 2009 02:12:51 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v4.13~22552
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=eee33abe592da1763550e6e55b1cfb7fdc6a9b4c;p=mirror_ubuntu-bionic-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] define KTIME_SCALAR for 32-bit s390
  [S390] add generic atomic64 support for 31 bit
  [S390] improve suspend/resume error messages
  [S390] set SCHED_OMIT_FRAME_POINTER for s390
  [S390] add __ucmpdi2() helper function
  [S390] perf_counter build fix
  [S390] shutdown actions: save/return rc from init function
  [S390] dasd: correct debugfeature sense dump
  [S390] udelay: disable lockdep to avoid false positives
  [S390] monreader: fix dev_set_drvdata conversion
  [S390] sclp: fix compile error for !SCLP_CONSOLE
---

eee33abe592da1763550e6e55b1cfb7fdc6a9b4c