]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
1  2 
drivers/scsi/libata-core.c
include/linux/pci_ids.h

Simple merge
Simple merge