diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-01 13:55:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-01 13:55:54 -0400 |
| commit | b10c4d40b3e413a908072acc53dea13e90c39aff (patch) | |
| tree | 3e487da92de125a35b267d8f7ac98878b9fd1fa6 /drivers/net/slip.h | |
| parent | 303a407002db563ae76d0f8a8ef0d8fe7954fcd4 (diff) | |
| parent | 7031307aefb6048377385dbb0af2dd43bb0190bb (diff) | |
Merge branch 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux:
i2c-s3c2410: fix calculation of SDA line delay
i2c-davinci: Fix race when setting up for TX
i2c-octeon: Return -ETIMEDOUT in octeon_i2c_wait() on timeout
Diffstat (limited to 'drivers/net/slip.h')
0 files changed, 0 insertions, 0 deletions