Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 May 2017 16:57:39 +0000 (09:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 May 2017 16:57:39 +0000 (09:57 -0700)
commit56fff1bb0f31358bf81a3c64a8dcd6da0dc44263
treeac9b5d6a04c02e345ac66caaa21d67b8adc5f396
parentfde8e33d106846b081b0e6cd5e283af7146eb7e4
parente2c824924cdb41528932c550647406ad81336b18
Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "Fix the i2c-designware regression of rc2.

  Also, a DMA buffer fix for the tiny-usb driver where the USB core now
  loudly complains about the non DMA-capable buffer"

[ I had cherry-picked the designware fix separately because it hit my
  laptop, but here is the proper sync with the i2c tree   - Linus ]

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: designware: Fix bogus sda_hold_time due to uninitialized vars
  i2c: i2c-tiny-usb: fix buffer not being DMA capable