summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-25 02:40:19 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-25 02:40:19 +0300
commit21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d (patch)
tree41b584d03391032cc6b1a5dc16b7e876cc8604b6 /fs
parenta792cd12cf07cf77c7d1d41b46b4f8327ecf82d0 (diff)
parent531660ef5604c75de6fdead9da1304051af17c09 (diff)
downloadlinux-21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d.tar.xz
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: Add i2c_board_info for RiscPC PCF8583 i2c: Make sure i2c_algo_bit_data.timeout is HZ-independent i2c-dev: Clarify the unit of ioctl I2C_TIMEOUT i2c: Timeouts reach -1 i2c: Fix misplaced parentheses
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions