]> git.hungrycats.org Git - linux/commit
Merge pobox.com:/spare/repo/linux-2.6
authorJeff Garzik <jgarzik@pobox.com>
Fri, 13 Aug 2004 15:56:56 +0000 (11:56 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 13 Aug 2004 15:56:56 +0000 (11:56 -0400)
commit923540a1804e39d1461993b8b23438cc5b52d51e
treed1655fb018ba369a75fe4f789cb422b3755f17c9
parentab1d1f0db0bdd87114d8d3af747458659a3a7690
parentce98f369249a73e37248e8843f607a04d4e6a57d
Merge pobox.com:/spare/repo/linux-2.6
into pobox.com:/spare/repo/libata-2.6
drivers/scsi/libata-core.c
drivers/scsi/sata_nv.c