Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/block/sx8.c
Simple merge

diff --cc drivers/media/radio/radio-gemtek-pci.c
Simple merge

diff --cc drivers/media/radio/radio-maxiradio.c
Simple merge

diff --cc drivers/pci/proc.c
Simple merge