Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Thu, 20 Apr 2006 21:27:45 +0000 (17:27 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 20 Apr 2006 21:27:45 +0000 (17:27 -0400)
commit9707b27100a48950f1e15e08a7c5028786e47f55
tree5745b1e7497ae1499a2e2e9e0a567996419ab34f
parent8fc65162a8f25929be80c8d6321a3479e92b5aae
parent402a26f0c040077ed6f941eefac5a6971f0d5f40
Merge branch 'master'
MAINTAINERS
include/linux/pci_ids.h