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)
commit7ebb253a1185602d985f1d5ffda4bc4593df3f25
tree0be8953bd75522e6d0aca7ef332cc23a179b1f04
parenta8bf51e5a902133b32ec7dca096b1cd60c04d24e
parent1a90846086594a79240727a24040fe7f6f33e3e6
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/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