diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 20:29:44 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 20:29:44 +0200 |
commit | 23059a0df5fad3d83b9a21fc2696a39148f49617 (patch) | |
tree | c23275fb1d4f6b4990d38c01344770c2d10f8e71 /fs/dlm/dir.c | |
parent | Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | fat: split fat_generic_ioctl (diff) | |
download | linux-23059a0df5fad3d83b9a21fc2696a39148f49617.tar.xz linux-23059a0df5fad3d83b9a21fc2696a39148f49617.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
fat: split fat_generic_ioctl
FAT: add 'errors' mount option
Diffstat (limited to 'fs/dlm/dir.c')
0 files changed, 0 insertions, 0 deletions