Merge branch 'for-2639/i2c/i2c-u2c12' into for-linus/2639/i2c-12

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

Sun, 20 Mar 2011 22:14:04 +0000 (22:14 +0000)

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

Sun, 20 Mar 2011 22:14:04 +0000 (22:14 +0000)
author Ben Dooks <ben-linux@fluff.org>
Sun, 20 Mar 2011 22:14:04 +0000 (22:14 +0000)
committer Ben Dooks <ben-linux@fluff.org>
Sun, 20 Mar 2011 22:14:04 +0000 (22:14 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/i2c/busses/Kconfig
Simple merge
diff --cc drivers/i2c/busses/Makefile
Simple merge
author	Ben Dooks <ben-linux@fluff.org>
	Sun, 20 Mar 2011 22:14:04 +0000 (22:14 +0000)
committer	Ben Dooks <ben-linux@fluff.org>
	Sun, 20 Mar 2011 22:14:04 +0000 (22:14 +0000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history