summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2011-11-01 01:54:17 +0100
committerBen Dooks <ben-linux@fluff.org>2011-11-01 01:54:17 +0100
commit3945fe9314af718946f71185901c28dd349469c7 (patch)
treecd716993a757f6bf61c48a2f88ef4c286c5fa994 /drivers/i2c
parentMerge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2 (diff)
parenti2c-nomadik: cosmetic coding style corrections (diff)
parenti2c-s3c2410: Add device tree support (diff)
parenti2c-tegra: __iomem annotation fix (diff)
downloadlinux-3945fe9314af718946f71185901c28dd349469c7.tar.xz
linux-3945fe9314af718946f71185901c28dd349469c7.zip
Merge branches 'for-32/i2c/nomadik', 'for-32/i2c/s3c2410-dt' and 'for-32/i2c/tegra-iomem' into for-linus/i2c-3.2