diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:31:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:31:27 -0700 |
| commit | 0481990b758628e12f4b0a9e15094e70cefc7cd1 (patch) | |
| tree | 67a4b4b7acc6a688b87ef2a2d3ec0e296e6e480c /arch/m68knommu | |
| parent | Merge branch 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
| parent | Merge by hand (conflicts in sd.c) (diff) | |
| download | linux-dev-0481990b758628e12f4b0a9e15094e70cefc7cd1.tar.xz linux-dev-0481990b758628e12f4b0a9e15094e70cefc7cd1.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'arch/m68knommu')
0 files changed, 0 insertions, 0 deletions