| commit | 93431dd7afa908292753acccb68785efaa366f5b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 11 08:21:29 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 11 08:21:29 2009 -0800 |
| tree | 42a64d0150e289f936afe12da91f601625e6b8b1 | |
| parent | da8dbb88db2af1e963090bd549a9a7dccffe991c [diff] | |
| parent | 95ec807e0a42188ec1ce29cf939816ad1e22f2d3 [diff] |
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] 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