diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-29 01:35:52 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-29 01:35:52 +0200 |
commit | d9ec5ad24ce80b7ef69a0717363db661d13aada5 (patch) | |
tree | 0a808684e7d5e61427ccd0ecb7f3849164a32aef /fs/cifs/file.c | |
parent | ppc: Fix typo in TI_LOCAL_FLAGS definition (diff) | |
parent | [PATCH] the latest consensus libata resume fix (diff) | |
download | linux-d9ec5ad24ce80b7ef69a0717363db661d13aada5.tar.xz linux-d9ec5ad24ce80b7ef69a0717363db661d13aada5.zip |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[PATCH] the latest consensus libata resume fix
Diffstat (limited to 'fs/cifs/file.c')
0 files changed, 0 insertions, 0 deletions