Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Dec 2010 16:04:08 +0000 (08:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Dec 2010 16:04:08 +0000 (08:04 -0800)
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] css: fix rsid evaluation for 2nd crw
  [S390] nohz/s390: fix arch_needs_cpu() return value on offline cpus


Trivial merge