diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-26 15:45:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-26 15:45:27 -0700 |
commit | a82642fa190029a438c0d09edb0e5463a0fe9e1e (patch) | |
tree | 92919f355dbf3f401a5ad96359dd6a741cd24f6a /fs/splice.c | |
parent | 58f8236bed448273cd7f9ae02c09467853303484 (diff) | |
parent | 3d63abe56be2147891b3438cb3bd37a9be72bda7 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc:
[MMC] pxamci: fix data timeout calculation
Diffstat (limited to 'fs/splice.c')
0 files changed, 0 insertions, 0 deletions