]> git.hungrycats.org Git - linux/commit
Resolve merge conflicts.
authorDavid S. Miller <davem@nuts.davemloft.net>
Tue, 18 May 2004 08:03:47 +0000 (01:03 -0700)
committerDavid S. Miller <davem@nuts.davemloft.net>
Tue, 18 May 2004 08:03:47 +0000 (01:03 -0700)
commit485b52519cab6d1198c2548a92b26f8d3dd272ec
treec07a51a364c3697f49cdab61511005d65128bd26
parent4282368cbcc697ea545ab4c1306aa769c660d115
Resolve merge conflicts.
drivers/pci/pci.ids