From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Dec 2013 19:37:57 +0000 (-0800)
Subject: Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=31f984d10cc7a83529d433dbc820556cf7e775ac;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'i2c/for-current' of git://git./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
---

31f984d10cc7a83529d433dbc820556cf7e775ac