Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:43:09 +0000 (15:43 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:43:09 +0000 (15:43 -0700)
commitc0d6f9663b30a09ed725229b2d50391268c8538e
tree7ba471cf9632097682ab55689cd64c9a68e11235
parent0db7443b2bd0b92da4e8afa46f8123a7076136c6
parent6fd60fa97b706e52abba7c9f810b148aa230817f
Merge kernel.org:/home/rmk/linux-2.6-i2c manually

Old tree, so the automatic merge had some problems.
drivers/i2c/busses/Kconfig