Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Dec 2014 19:26:01 +0000 (11:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Dec 2014 19:26:01 +0000 (11:26 -0800)
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


Trivial merge