From: Linus Torvalds Date: Sat, 18 Apr 2015 12:19:04 +0000 (-0400) Subject: Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa... X-Git-Tag: firefly_0821_release~176^2~1938 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=40d7839879b4584f91522d841afb22ed401cf40f;p=firefly-linux-kernel-4.4.55.git Merge branch 'i2c/for-next' of git://git./linux/kernel/git/wsa/linux Pull i2c fixes from Wolfram Sang: "Two buildfixes for I2C based on your tree from the day before yesterday. Sadly, these build errors never reached me while the patches were sitting in -next. Need to fix that" * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: core: Export bus recovery functions i2c: jz4780: Fix build for m68k and sparc64 --- 40d7839879b4584f91522d841afb22ed401cf40f