linux/drivers/i2c
Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-22 00:36:56 -06:00
..
algos i2c-algo-pca: Fix coding style issues 2010-05-21 18:41:00 +02:00
busses Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
i2c-boardinfo.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
i2c-core.c Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
i2c-core.h i2c: Use rwsem instead of mutex for board info 2009-06-19 16:58:20 +02:00
i2c-dev.c i2c-dev: Fix all coding style issues 2010-05-21 18:40:59 +02:00
i2c-smbus.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
Kconfig i2c: Drop configure option I2C_DEBUG_CHIP 2010-03-13 20:56:55 +01:00
Makefile tsl2550: Move from i2c/chips to misc 2010-03-13 20:56:54 +01:00