| commit | 31f984d10cc7a83529d433dbc820556cf7e775ac | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 13 11:37:57 2013 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 13 11:37:57 2013 -0800 |
| tree | cfc634875ffc83a436270c56bbca9a020554a1d2 | |
| parent | dbb022cb4605fbbf506d57aefedd664876fa2fc2 [diff] | |
| parent | e5bf216a945e7292f8718276372d2b41486bed26 [diff] |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux Pull i2c fixes from Wolfram Sang: "Here are two simple but wanted fixes for the i2c subsystem" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: imx: Check the return value from clk_prepare_enable() i2c: mux: Inherit retry count and timeout from parent for muxed bus