| commit | 28928b2f1d769abdc173c96e2632d30cbde9ec4a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 02 15:28:45 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 02 15:28:45 2008 -0700 |
| tree | 2b5af75aba6c6ca2d5130fb8dcf027f282ed07ff | |
| parent | 63e14626eddb534ab429e9c2b95d3f7038b596b6 [diff] | |
| parent | 0f475b2abed6cbccee1da20a0bef2895eb2a0edd [diff] |
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: [PATCH 3/3] ocfs2/net: Silence build warnings [PATCH 2/3] ocfs2/dlm: Silence build warnings [PATCH 1/3] ocfs2/net: Silence build warnings ocfs2: Rename 'user_stack' plugin structure to 'ocfs2_user_plugin'