diff options
author | Ben Dooks <ben-linux@fluff.org> | 2011-11-01 01:54:17 +0100 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2011-11-01 01:54:17 +0100 |
commit | 3945fe9314af718946f71185901c28dd349469c7 (patch) | |
tree | cd716993a757f6bf61c48a2f88ef4c286c5fa994 /arch/arm/mach-u300/Kconfig | |
parent | Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2 (diff) | |
parent | i2c-nomadik: cosmetic coding style corrections (diff) | |
parent | i2c-s3c2410: Add device tree support (diff) | |
parent | i2c-tegra: __iomem annotation fix (diff) | |
download | linux-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