| commit | 4dcaadc3193d494baed79dc2055a6eefbebe0454 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 08 16:42:34 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 08 16:42:34 2011 -0700 |
| tree | 9a1d858df9bd64f2cb13e0cc2e9803163f55aa06 | |
| parent | 4fbcc42dc4d069aa941873ce28f3e98f51cb4fd3 [diff] | |
| parent | 96219c3a257cc8ba3b3cae67efdc88be37cf7c9d [diff] |
Merge branch 'for-31-rc5/i2c-fixes' of git://git.fluff.org/bjdooks/linux * 'for-31-rc5/i2c-fixes' of git://git.fluff.org/bjdooks/linux: i2c-tegra: fix possible race condition after tx i2c-tegra: add I2C_FUNC_SMBUS_EMUL i2c-tegra: Add of_match_table i2c-pxa2xx: return proper error code in ce4100_i2c_probe error paths