summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2011-03-16 20:59:01 +0000
committerBen Dooks <ben-linux@fluff.org>2011-03-16 20:59:01 +0000
commitead9a638c8f7a4f6471a130c854afafeccbb0824 (patch)
treeb35b8551f9ec08e8d32a9c41bc994b019f939a39 /include
parentdb811ca0f48578f9940f49f284ac81e336b264ad (diff)
parent0724d46417545aa3035d88fb8885dffe68817a8c (diff)
parenta8da7fecb6010222fe495cc2b4330b99bca20c61 (diff)
downloadlinux-ead9a638c8f7a4f6471a130c854afafeccbb0824.tar.bz2
Merge branches 'for-2639/i2c/i2c-tegra', 'for-2639/i2c/i2c-mpc' and 'for-2639/i2c/i2c-imx' into for-linus/2639/i2c-1