diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 00:54:55 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 00:54:55 +0400 |
| commit | e472233fc52d9556cab7d8a1164ccd93ab36fb91 (patch) | |
| tree | 9b5f8262ca8517532616cdd537c8867cee915c65 /fs/hfsplus/hfsplus_fs.h | |
| parent | 72e19b3b22f43b20ee84db0deba33c71803cbe34 (diff) | |
| parent | d6817cdbd143f87f9d7c59a4c3194091190eeb84 (diff) | |
| download | linux-e472233fc52d9556cab7d8a1164ccd93ab36fb91.tar.xz | |
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: Increment the reference count of an already-active stack.
[PATCH] configfs: Consolidate locking around configfs_detach_prep() in configfs_rmdir()
ocfs2: correctly set i_blocks after inline dir gets expanded
ocfs2: Jump to correct label in ocfs2_expand_inline_dir()
ocfs2: Fix sleep-with-spinlock recovery regression
[PATCH] ocfs2/cluster/netdebug.c: fix warning
[PATCH] ocfs2/cluster/tcp.c: make some functions static
Diffstat (limited to 'fs/hfsplus/hfsplus_fs.h')
0 files changed, 0 insertions, 0 deletions