Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 02:41:42 +0000 (18:41 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 02:41:42 +0000 (18:41 -0800)
commit977127174a7dff52d17faeeb4c4949a54221881f
treeb05b9d18a1256d7ed97bdfb537213a8d70ccca57
parent80c0531514516e43ae118ddf38424e06e5c3cb3c
parent93b47684f60cf25e8cefe19a21d94aa0257fdf36
Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6
MAINTAINERS
drivers/block/sx8.c
drivers/media/radio/radio-gemtek-pci.c
drivers/media/radio/radio-maxiradio.c
drivers/pci/proc.c