Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pobox.com>
Tue, 23 Aug 2005 05:07:10 +0000 (01:07 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 23 Aug 2005 05:07:10 +0000 (01:07 -0400)
1  2 
include/linux/pci_ids.h

Simple merge