From: Linus Torvalds Date: Tue, 23 May 2017 16:57:39 +0000 (-0700) Subject: Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa... X-Git-Tag: MMI-PSA29.97-13-9~5542 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=56fff1bb0f31358bf81a3c64a8dcd6da0dc44263;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 --- 56fff1bb0f31358bf81a3c64a8dcd6da0dc44263