]> git.neil.brown.name Git - history.git/commit
Merge
authorLinus Torvalds <torvalds@home.transmeta.com>
Mon, 30 Dec 2002 10:29:20 +0000 (02:29 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Mon, 30 Dec 2002 10:29:20 +0000 (02:29 -0800)
commit92bde82bb5351a8633f0c7a5e9d6b9c88f111556
tree135a05fa37ceb1eabb0216ace4a4206b4ad51294
parent27b3d11b51725704a8aab84dbc36258b1f53a250
parentdc1a5b93e96e42def291dc2f59c55f7256501e2a
Merge
drivers/scsi/aic7xxx/aic7xxx_osm.c
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c