| commit | 6f36a806e588f2ce62571a1859ea1d7f2c7dde83 | [log] [tgz] |
|---|---|---|
| author | Ben Dooks <ben-linux@fluff.org> | Tue Jan 17 23:30:41 2012 +0000 |
| committer | Ben Dooks <ben-linux@fluff.org> | Tue Jan 17 23:30:41 2012 +0000 |
| tree | 44485aee19bcaf05b0baaf83ea62d7e5ddd78b9c | |
| parent | 8956dc102ca26357850830f1d26132719c1ce6ee [diff] | |
| parent | 6145197be6cc0583fa1a2f4ec1079d366137061e [diff] |
Merge branches 'for-33/i2c/eg20t' and 'for-33/i2c/omap' into for-linus/i2c-33