Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Linus Torvalds [Tue, 10 Jan 2006 02:41:42 +0000 (18:41 -0800)]
1  2 
MAINTAINERS
drivers/block/sx8.c
drivers/media/radio/radio-gemtek-pci.c
drivers/media/radio/radio-maxiradio.c
drivers/pci/proc.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge