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

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

Tue, 12 Jul 2005 22:54:36 +0000 (15:54 -0700)

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

Tue, 12 Jul 2005 22:54:36 +0000 (15:54 -0700)
author Linus Torvalds <torvalds@g5.osdl.org>
Tue, 12 Jul 2005 22:54:36 +0000 (15:54 -0700)
committer Linus Torvalds <torvalds@g5.osdl.org>
Tue, 12 Jul 2005 22:54:36 +0000 (15:54 -0700)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/h8300/Kconfig
Simple merge
diff --cc arch/sparc64/Kconfig
Simple merge
diff --cc drivers/Kconfig
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Tue, 12 Jul 2005 22:54:36 +0000 (15:54 -0700)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Tue, 12 Jul 2005 22:54:36 +0000 (15:54 -0700)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/h8300/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/sparc64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history