diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 02:44:21 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 02:44:21 +0200 |
| commit | 501b7c77de3e90519e95fd99e923bf9a29cd120d (patch) | |
| tree | f7dc56286e7309186f335d32f03434e82f31a41d /include/asm-cris | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | ocfs2: remove redundant NULL checks in ocfs2_direct_IO_get_blocks() (diff) | |
| download | linux-501b7c77de3e90519e95fd99e923bf9a29cd120d.tar.xz linux-501b7c77de3e90519e95fd99e923bf9a29cd120d.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: remove redundant NULL checks in ocfs2_direct_IO_get_blocks()
ocfs2: clean up some osb fields
ocfs2: fix init of uuid_net_key
ocfs2: silence a debug print
ocfs2: silence ENOENT during lookup of broken links
ocfs2: Cleanup message prints
ocfs2: silence -EEXIST from ocfs2_extent_map_insert/lookup
[PATCH] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() static
ocfs2: warn the user on a dead timeout mismatch
ocfs2: OCFS2_FS must depend on SYSFS
ocfs2: Compile-time disabling of ocfs2 debugging output.
configfs: Clear up a few extra spaces where there should be TABs.
configfs: Release memory in configfs_example.
Diffstat (limited to 'include/asm-cris')
0 files changed, 0 insertions, 0 deletions