From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Dec 2014 19:26:01 +0000 (-0800)
Subject: Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=15bd1e5cb36306a015328aa1c2b6470a25153171;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "Here are two more driver bugfixes for I2C which would be good to have"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: cadence: Set the hardware time-out register to maximum value
  i2c: davinci: generate STP always when NACK is received
---

15bd1e5cb36306a015328aa1c2b6470a25153171