The following commit has been merged in the linux branch: commit 7d531a7e519406c4bb2501a66e3da5ba39280739 Merge: a80a66caf8110fc33af8013353fe0da0ae553a13 b3dcf3de8e4d71d79235fc67b6c5def6506c27f8 Author: Linus Torvalds torvalds@linux-foundation.org Date: Sat Oct 31 12:14:56 2009 -0700

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] smp: fix sigp sense handling [S390] smp: fix sigp stop handling [S390] cputime: fix overflow on 31 bit systems [S390] call home: fix string length handling [S390] call home: fix error handling in init function [S390] smp: fix prefix handling of offlined cpus [S390] s/r: cmm resume fix [S390] call home: fix local buffer usage in proc handler