Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Feb 2009 16:21:29 +0000 (08:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Feb 2009 16:21:29 +0000 (08:21 -0800)
commit93431dd7afa908292753acccb68785efaa366f5b
tree42a64d0150e289f936afe12da91f601625e6b8b1
parentda8dbb88db2af1e963090bd549a9a7dccffe991c
parent95ec807e0a42188ec1ce29cf939816ad1e22f2d3
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