Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Linus Torvalds [Tue, 12 Jul 2005 22:54:36 +0000 (15:54 -0700)]
1  2 
arch/arm/Kconfig
arch/h8300/Kconfig
arch/sparc64/Kconfig
drivers/Kconfig

Simple merge
Simple merge
Simple merge
diff --cc drivers/Kconfig
Simple merge