summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/chips
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-14 18:11:34 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-14 18:11:34 +0200
commit9a7e9f1c60bada782014b2f422f6c68c4d5388f3 (patch)
tree7e874364f448e050edd6058c50e1e70346b99696 /drivers/i2c/chips
parentMerge branch 'tee' of git://brick.kernel.dk/data/git/linux-2.6-block (diff)
parent[fuse] Direct I/O should not use fuse_reset_request (diff)
downloadlinux-9a7e9f1c60bada782014b2f422f6c68c4d5388f3.tar.xz
linux-9a7e9f1c60bada782014b2f422f6c68c4d5388f3.zip
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mszeredi/fuse: [fuse] Direct I/O should not use fuse_reset_request [fuse] Don't init request twice [fuse] Fix accounting the number of waiting requests [fuse] fix deadlock between fuse_put_super() and request_end()
Diffstat (limited to 'drivers/i2c/chips')
0 files changed, 0 insertions, 0 deletions