From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Tue, 9 Jan 2007 17:34:20 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.20-rc5~36
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=599c853195f43dfbcbf28b362e6ae80ffa33fec7;p=~emulex%2Finfiniband.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] locking problem with __cpcmd.
  [S390] don't call handle_mm_fault() if in an atomic context.
  [S390] Fix vmalloc area size calculation.
  [S390] Fix cpu hotplug (missing 'online' attribute).
  [S390] cio: use barrier() in stsch_reset.
  [S390] memory detection misses 128k.
---

599c853195f43dfbcbf28b362e6ae80ffa33fec7