]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Dec 2013 19:37:57 +0000 (11:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Dec 2013 19:37:57 +0000 (11:37 -0800)
commit31f984d10cc7a83529d433dbc820556cf7e775ac
treecfc634875ffc83a436270c56bbca9a020554a1d2
parentdbb022cb4605fbbf506d57aefedd664876fa2fc2
parente5bf216a945e7292f8718276372d2b41486bed26
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