diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-06 11:26:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-06 11:26:01 -0800 |
| commit | 15bd1e5cb36306a015328aa1c2b6470a25153171 (patch) | |
| tree | 0be8953bd75522e6d0aca7ef332cc23a179b1f04 /drivers/watchdog/s3c2410_wdt.c | |
| parent | beb5af4033cbeae2d50b4a6d770ab8901fd34d7a (diff) | |
| parent | 681d15a0f527af7ab3a783e1037de86fbcb136ac (diff) | |
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
Diffstat (limited to 'drivers/watchdog/s3c2410_wdt.c')
0 files changed, 0 insertions, 0 deletions