diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 12:50:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 12:50:25 -0800 |
commit | 3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32 (patch) | |
tree | 5d5920258fc8e3bafd16fddf5fb92f9ec0bb3cc1 /fs/ocfs2/aops.h | |
parent | 75b08038ceb62f3bd8935346679920f97c3cf9f6 (diff) | |
parent | 2c948b3f86e5f0327e2e57858600af6e6f0ae29a (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
udf: Avoid IO in udf_clear_inode
udf: Try harder when looking for VAT inode
udf: Fix compilation with UDFFS_DEBUG enabled
Diffstat (limited to 'fs/ocfs2/aops.h')
0 files changed, 0 insertions, 0 deletions