diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2011-05-25 00:25:55 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-05-25 00:25:55 +0100 |
| commit | 5bdfdfeed5eed599a3ddc455f7c254a209ceae8d (patch) | |
| tree | 3088f62f31ca79b50f0ed57d237cdc185f60bba5 | |
| parent | efbe0f27ccfa7237c5524b10e8ccc91f97002f16 (diff) | |
| parent | 81f8115305f821335cf9e16110bf0806f7b93283 (diff) | |
| parent | 40abcf772357355a04f966416eebc943fd0281d4 (diff) | |
| parent | 2b030bda66b0a59f8ebf0ce2117088256a5f9f97 (diff) | |
Merge branches 'for-2639/i2c-eg20t', 'for-2639/i2c-shmobile', 'for-2639/i2c-tegra' and 'for-2639/i2c-nomadik2' into for-linus/2640/i2c