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)
commitc2048b0a0a6e589d9813766489f78185cbabcdc6
treee3245fb17e97329925d0aa0a350f604d6d3f1f71
parentde47de7404e29df8de82f5822b4fde1a6ed97b54
parent8d7bfb4a891d606d52e1a99cf7231b4417b935dc
Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6

* '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