Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@woody.osdl.org>
Tue, 9 Jan 2007 17:34:20 +0000 (09:34 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Tue, 9 Jan 2007 17:34:20 +0000 (09:34 -0800)
commit599c853195f43dfbcbf28b362e6ae80ffa33fec7
tree0a4730bd6cb2289bc3b81fdac1d42888d9de8e5f
parent2f5c33b3180169f3eafb698b66686962d637fb0e
parentbf3dbdcd0bfca74c16ad0b2b5a978907c864ed4c
Merge branch 'for-linus' of git://git390.osdl.marist.edu/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.