Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 12 Jul 2005 22:54:36 +0000 (15:54 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 12 Jul 2005 22:54:36 +0000 (15:54 -0700)
commit22a4427972af371fddb49c0184a93851ad51070d
tree2d513301698bc8c5b691caf7268a57f296fdf69d
parent9f02d6b7b43d46a74dd385f06090104ecd0fb807
parentede7fbdf526c314850c9f32dd8da1753bf8d0ad5
Merge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
arch/arm/Kconfig
arch/h8300/Kconfig
arch/sparc64/Kconfig
drivers/Kconfig