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

author Linus Torvalds <torvalds@g5.osdl.org>

Tue, 10 Jan 2006 02:41:42 +0000 (18:41 -0800)

committer Linus Torvalds <torvalds@g5.osdl.org>

Tue, 10 Jan 2006 02:41:42 +0000 (18:41 -0800)
author Linus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 02:41:42 +0000 (18:41 -0800)
committer Linus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 02:41:42 +0000 (18:41 -0800)
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
author	Linus Torvalds <torvalds@g5.osdl.org>
	Tue, 10 Jan 2006 02:41:42 +0000 (18:41 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Tue, 10 Jan 2006 02:41:42 +0000 (18:41 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/block/sx8.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/radio/radio-gemtek-pci.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/radio/radio-maxiradio.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/proc.c	patch \|	diff1 \|	diff2 \|	blob \| history