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

Browse source

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

...

This commit is contained in:

Linus Torvalds 2018-03-03 14:55:20 -08:00

parent 20f14172cb 7c4246797b

commit 58bdf601c2

3 changed files with 3 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

Documentation/devicetree/bindings/eeprom/at24.txt

View file

1

drivers/i2c/busses/i2c-octeon-core.c

View file

2

drivers/i2c/busses/i2c-octeon-core.h

View file