diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 14:42:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 14:42:39 -0700 |
commit | f3f94ce5dba6e134cf0958dd3a42ab28a028fc83 (patch) | |
tree | 4539d11ddc93f000c96e3a21976cf4b4fe6742d1 /fs/nfsd | |
parent | 5d9adefc1e7218d060a88416943dd18e86c3c975 (diff) | |
parent | 939bc4943d0483961edc45b63a7d27b4ffe547e3 (diff) |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c-algo-bit: Read block data bugfix
i2c-pxa: Fix adapter number
i2c-gpio: Fix adapter number
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions