Merge branches 'for-2639/i2c/i2c-tegra', 'for-2639/i2c/i2c-mpc' and 'for-2639/i2c...

author Ben Dooks <ben-linux@fluff.org>

Wed, 16 Mar 2011 20:59:01 +0000 (20:59 +0000)

committer Ben Dooks <ben-linux@fluff.org>

Wed, 16 Mar 2011 20:59:01 +0000 (20:59 +0000)
author Ben Dooks <ben-linux@fluff.org>
Wed, 16 Mar 2011 20:59:01 +0000 (20:59 +0000)
committer Ben Dooks <ben-linux@fluff.org>
Wed, 16 Mar 2011 20:59:01 +0000 (20:59 +0000)
diff --cc drivers/i2c/busses/Kconfig
Simple merge
diff --cc drivers/i2c/busses/Makefile
Simple merge
author	Ben Dooks <ben-linux@fluff.org>
	Wed, 16 Mar 2011 20:59:01 +0000 (20:59 +0000)
committer	Ben Dooks <ben-linux@fluff.org>
	Wed, 16 Mar 2011 20:59:01 +0000 (20:59 +0000)
		1	2	3
drivers/i2c/busses/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/i2c/busses/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history