Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Dec 2018 22:49:56 +0000 (14:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Dec 2018 22:49:56 +0000 (14:49 -0800)
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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge