Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Sep 2016 16:43:10 +0000 (09:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Sep 2016 16:43:10 +0000 (09:43 -0700)
commitb8db3714d7479881e23de20735f60f1733723241
tree398e50ba60df642d66d470755ead99b24383daf5
parent6905732c80bc7f85602abbe27f7bdc3fe81f56d0
parentcbfff439c54f37fc363b1d365183fa61af43585c
Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "Mostly driver bugfixes, but also a few cleanups which are nice to have
  out of the way"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: rk3x: Restore clock settings at resume time
  i2c: Spelling s/acknowedge/acknowledge/
  i2c: designware: save the preset value of DW_IC_SDA_HOLD
  Documentation: i2c: slave-interface: add note for driver development
  i2c: mux: demux-pinctrl: run properly with multiple instances
  i2c: bcm-kona: fix inconsistent indenting
  i2c: rcar: use proper device with dma_mapping_error
  i2c: sh_mobile: use proper device with dma_mapping_error
  i2c: mux: demux-pinctrl: invalidate properly when switching fails