Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit21f130a2370ba837cdfc5204ebe52e7c664fec3d
authorDavid S. Miller <davem@sunset.davemloft.net>
Sun, 18 Sep 2005 07:17:10 +0000 (18 00:17 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sun, 18 Sep 2005 07:17:10 +0000 (18 00:17 -0700)
tree7f8a30088d8d39eab9350c59b6638661309ffe89
parentbc5e8fdfc622b03acf5ac974a1b8b26da6511c99
parentc58ec93245a1fb7354f9e331960380827b9f41db
Merge /pub/scm/linux/kernel/git/davem/net-2.6
include/linux/pci_ids.h