]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit60539aa8b0edd1158b7198e11baf60c4740b26cb
treeac9b5d6a04c02e345ac66caaa21d67b8adc5f396
parentc3744f8feffa7b3ac5de01b012a177ace696b283
parent11b1e2d9fc83d1e8af0216a3a7891ca8b4886647
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/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