projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: afad97e c1c21f4)
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)
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


Trivial merge