Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pobox.com>
Fri, 23 Sep 2005 23:03:21 +0000 (19:03 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 23 Sep 2005 23:03:21 +0000 (19:03 -0400)
commit536f8098026bde1368bbfcbcb9682a7637b73df2
treecf83d2e1afa503b6aeba103b55cd1da0af4e7a4c
parente86ee6682b649183c11013a98be02f25e9ae399d
parent3fd07d3bf0077dcc0f5a33d2eb1938ea050da8da
Merge /spare/repo/linux-2.6/
drivers/scsi/libata-core.c
include/linux/pci_ids.h