Merge branches 'for-2639/i2c/i2c-tegra', 'for-2639/i2c/i2c-mpc' and 'for-2639/i2c...
authorBen Dooks <ben-linux@fluff.org>
Wed, 16 Mar 2011 20:59:01 +0000 (20:59 +0000)
committerBen Dooks <ben-linux@fluff.org>
Wed, 16 Mar 2011 20:59:01 +0000 (20:59 +0000)
commitead9a638c8f7a4f6471a130c854afafeccbb0824
treeb35b8551f9ec08e8d32a9c41bc994b019f939a39
parentdb811ca0f48578f9940f49f284ac81e336b264ad
parent0724d46417545aa3035d88fb8885dffe68817a8c
parenta8da7fecb6010222fe495cc2b4330b99bca20c61
Merge branches 'for-2639/i2c/i2c-tegra', 'for-2639/i2c/i2c-mpc' and 'for-2639/i2c/i2c-imx' into for-linus/2639/i2c-1
drivers/i2c/busses/Kconfig
drivers/i2c/busses/Makefile