Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
algos	i2c/algos: convert Kconfig to use the menu's `visible' keyword	2010-11-22 11:27:35 -02:00
busses	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
muxes	i2c/pca954x: Remove __devinit and __devexit from probe and remove functions	2010-10-24 18:16:59 +02: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: Sanity checks on adapter registration	2010-11-15 22:40:38 +01: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: Let i2c_parent_is_i2c_adapter return the parent adapter	2010-10-24 18:16:57 +02:00
i2c-mux.c	i2c: Mark i2c_adapter.id as deprecated	2010-11-15 22:40:38 +01:00
i2c-smbus.c	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
Kconfig	Revert "i2c: Fix Kconfig dependencies"	2010-11-22 11:27:33 -02:00
Makefile	i2c: Change to new flag variable	2010-10-24 18:16:58 +02:00