From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Mar 2018 22:55:20 +0000 (-0800)
Subject: Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.19~1485
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58bdf601c2de6071d0386a7a6fa707bd04761c47;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'i2c/for-current-fixed' of git://git./linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "A driver fix and a documentation fix (which makes dependency handling
  for the next cycle easier)"

* 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: octeon: Prevent error message on bus error
  dt-bindings: at24: sort manufacturers alphabetically
---

58bdf601c2de6071d0386a7a6fa707bd04761c47