You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		15 years ago
..
algos	i2c-algo-pca: Fix coding style issues	15 years ago
busses	Merge remote branch 'origin' into secretlab/next-devicetree	15 years ago
Kconfig	i2c: Drop configure option I2C_DEBUG_CHIP	15 years ago
Makefile	tsl2550: Move from i2c/chips to misc	15 years ago
i2c-boardinfo.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
i2c-core.c	Merge remote branch 'origin' into secretlab/next-devicetree	15 years ago
i2c-core.h	i2c: Use rwsem instead of mutex for board info	16 years ago
i2c-dev.c	i2c-dev: Fix all coding style issues	15 years ago
i2c-smbus.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago