Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Apr 2015 12:19:04 +0000 (08:19 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Apr 2015 12:19:04 +0000 (08:19 -0400)
commit40d7839879b4584f91522d841afb22ed401cf40f
treebe7ceff0b9749487e05d2edaff23364911705bdd
parentafad97eee47c1f1f242202e2473929b4ef5d9f43
parentc1c21f4e60ed4523292f1a89ff45a208bddd3849
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