| commit | be2e88011bd800222bfd7b477c727966f93186a9 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 2 May 2008 20:53:07 +0000 (2 13:53 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 2 May 2008 20:53:07 +0000 (2 13:53 -0700) | ||
| tree | 089ab03feb7cfde6a1b548e9de70ee35860d393d | treesnapshot (tar.gz zip) |
| parent | d626e3bf728c47746f2129aa00c775d4e8c2a73b | commitdiff |
| parent | 4ba1c5bfd2e5a6c9528eb7777b66c297e70f61ca | commitdiff |
Merge branch 'upstream-linus' of git://git./linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Use GFP_NOFS in kmalloc during localalloc window move
ocfs2: Allow uid/gid/perm changes of symlinks
ocfs2/dlm: dlmdebug.c: make 2 functions static
ocfs2: make struct o2cb_stack_ops static
ocfs2: make struct ocfs2_control_device static
ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Use GFP_NOFS in kmalloc during localalloc window move
ocfs2: Allow uid/gid/perm changes of symlinks
ocfs2/dlm: dlmdebug.c: make 2 functions static
ocfs2: make struct o2cb_stack_ops static
ocfs2: make struct ocfs2_control_device static
ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)