tree 7fdc7d1ad2be05e7807c57cb680cd73f4a3c1f7f
parent f57b620a89ad2eee2e25218b5cb2bee0ad1e2e7d
parent 32774a8153b4c62e408297fba352248afb2e0143
author Linus Torvalds <torvalds@linux-foundation.org> 1545346196 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1545346196 -0800

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

Pull i2c fixes from Wolfram Sang:
 "I2C has a MAINTAINERS update for you, so people will be immediately
  pointed to the right person for this previously orphaned driver.

  And one of Arnd's build warning fixes for a new driver added this
  cycle"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: nvidia-gpu: mark resume function as __maybe_unused
  MAINTAINERS: add entry for i2c-axxia driver