Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6

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

Mon, 9 Feb 2004 07:40:28 +0000 (23:40 -0800)

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

Mon, 9 Feb 2004 07:40:28 +0000 (23:40 -0800)
author Linus Torvalds <torvalds@home.osdl.org>
Mon, 9 Feb 2004 07:40:28 +0000 (23:40 -0800)
committer Linus Torvalds <torvalds@home.osdl.org>
Mon, 9 Feb 2004 07:40:28 +0000 (23:40 -0800)
diff --cc drivers/base/core.c
Simple merge
diff --cc include/linux/device.h
Simple merge
author	Linus Torvalds <torvalds@home.osdl.org>
	Mon, 9 Feb 2004 07:40:28 +0000 (23:40 -0800)
committer	Linus Torvalds <torvalds@home.osdl.org>
	Mon, 9 Feb 2004 07:40:28 +0000 (23:40 -0800)
		1	2
drivers/base/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/device.h	patch \|	diff1 \|	diff2 \|	blob \| history