From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 26 Mar 2007 21:45:56 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.21-rc6~115
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6288c338661cc26ea66e7818b0d3862ee163fd1d;p=karo-tx-linux.git

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 ap_poll_requests counter in lost requests error path.
  [S390] zcrypt: Fix possible dead lock in AP bus module.
  [S390] cio: Device status validity.
  [S390] kprobes: Align probe address.
  [S390] Fix TCP/UDP pseudo header checksum computation.
  [S390] dasd: Work around gcc bug.
---

6288c338661cc26ea66e7818b0d3862ee163fd1d