From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 20 Mar 2007 03:04:26 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.21-rc5~55
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=511b00a3194167bad447d4c81027d6a44920dfd2;p=linux-2.6

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

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] zcrypt: fix possible race when unloading zcrypt driver modules
  [S390] zcrypt: fix possible dead lock in AP bus module
  [S390] Wire up sys_utimes.
  [S390] reboot from and dump to SCSI under z/VM fails.
  [S390] Wire up compat_sys_epoll_pwait.
  [S390] strlcpy is smart enough
  [S390] memory detection: fix off by one bug.
  [S390] cio: qdio slsb setup
---

511b00a3194167bad447d4c81027d6a44920dfd2