Russell King ac1d426e82 Merge branch 'devel-stable' into devel ... Conflicts: arch/arm/Kconfig arch/arm/include/asm/system.h arch/arm/mm/Kconfig		2010-05-17 17:24:04 +01:00
..
algos	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
busses	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01: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	i2c-core: Use per-adapter userspace device lists	2010-05-04 11:09:28 +02:00
i2c-core.h
i2c-dev.c	i2c: Remove big kernel lock from i2cdev_open	2009-12-06 17:06:26 +01: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