Russell King 7d78c887a9 [DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms ... Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>		2005-11-17 15:47:30 +00:00
..
algos
busses	[DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms	2005-11-17 15:47:30 +00:00
chips	Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel	2005-11-11 09:24:26 -08:00
i2c-core.c
i2c-dev.c
Kconfig
Makefile