From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Feb 2009 16:21:29 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=93431dd7afa908292753acccb68785efaa366f5b;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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] Update default configuration.
  [S390] dasd: fix race in dasd timer handling
  [S390] dasd: bus_id -> dev_name() conversion.
  [S390] Fix init irq proc build break.
  [S390] vdso: fix per cpu vdso pointer in lowcore
---

93431dd7afa908292753acccb68785efaa366f5b