Merge branch 'master'
Jeff Garzik [Thu, 20 Apr 2006 21:27:45 +0000 (17:27 -0400)]
1  2 
MAINTAINERS
include/linux/pci_ids.h

diff --cc MAINTAINERS
Simple merge
Simple merge