diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2011-11-01 00:54:17 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-11-01 00:54:17 +0000 |
| commit | 3945fe9314af718946f71185901c28dd349469c7 (patch) | |
| tree | cd716993a757f6bf61c48a2f88ef4c286c5fa994 /drivers/i2c/busses/i2c-nomadik.c | |
| parent | be4af5dfa6d976ba579bae16ff8714b755d44dad (diff) | |
| parent | 8abf6fbbd22bc777fd4027cbc55e99cdfb7a8324 (diff) | |
| parent | 5a5f50802f5a31b9e15de8df40d5621af970a560 (diff) | |
| parent | f533c61e1921b93aa247d72d39c3fbe045340a9a (diff) | |
Merge branches 'for-32/i2c/nomadik', 'for-32/i2c/s3c2410-dt' and 'for-32/i2c/tegra-iomem' into for-linus/i2c-3.2