diff options
| author |   Ben Dooks <ben-linux@fluff.org> | 2011-06-27 23:07:24 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-06-27 23:07:24 +0100 |
| commit | 69f81e86540716e68e98e401bb91f339d6a0d31f (patch) | |
| tree | 553d543a7ca6705b6a619bbaa9673dba3ea6fa4c /include/linux/timerqueue.h | |
| parent | i2c-bfin-twi: abort transfer is MEM bit is reset unexpectedly (diff) | |
| parent | i2c-s3c2410: Remove useless break code (diff) | |
| parent | i2c: tegra: Assign unused slave address (diff) | |
Merge branches 'for-30-rc4/i2c-bfin', 'for-30-rc4/i2c-omap', 'for-30-rc4/i2c-s3c' and 'for-30-rc4/i2c-tegra' into for-30-rc5/all-i2c