Arnd Bergmann dcf7ec5ee6 Merge branch 'samsung/driver' into next/drivers ... Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 16:16:29 +00:00
..
algos	i2c-algo-bit: Generate correct i2c address sequence for 10-bit target	2011-11-23 11:33:07 +01:00
busses	Merge branch 'samsung/driver' into next/drivers	2012-01-09 16:16:29 +00:00
muxes	i2c/pca954x: Initialize the mux to disconnected state	2011-06-29 11:36:11 +02:00
i2c-boardinfo.c	i2c: add export.h to i2c-boardinfo.c for EXPORT_SYMBOL	2011-10-31 19:31:29 -04:00
i2c-core.c	i2c: Fix device name for 10-bit slave address	2011-11-23 11:33:07 +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: Make i2cdev_notifier_call static	2011-11-23 11:33:07 +01: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	doc: Kconfig: Typo: square -> squared	2011-07-11 14:22:32 +02:00
Makefile	i2c: Deprecate i2c_driver.attach_adapter and .detach_adapter	2011-03-20 14:50:53 +01:00