From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Jun 2016 18:24:54 +0000 (-0700)
Subject: Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa... 
X-Git-Tag: v4.7-rc3~5
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=5d1f7023fb2233d454ac3ac2fb7cc96fb94e9cac;p=cascardo%2Flinux.git

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

Pull i2c fixes from Wolfram Sang:

 - a bigger fix for i801 to finally be able to be loaded on some
   machines again

 - smaller driver fixes

 - documentation update because of a renamed file

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: mux: reg: Provide of_match_table
  i2c: mux: refer to i2c-mux.txt
  i2c: octeon: Avoid printk after too long SMBUS message
  i2c: octeon: Missing AAK flag in case of I2C_M_RECV_LEN
  i2c: i801: Allow ACPI SystemIO OpRegion to conflict with PCI BAR
---

5d1f7023fb2233d454ac3ac2fb7cc96fb94e9cac