diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 16:30:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 16:30:47 -0700 |
| commit | 7e567b44e6c59ad8bec321afb03302ffb1e6dda6 (patch) | |
| tree | bd02466f931a471691db1da47d6d072924cfef1f /MAINTAINERS | |
| parent | 020f932bd246e9d595f7a006250762d98ffeab46 (diff) | |
| parent | 2191aebaf9af9125bfee32808babe6f61446c8a6 (diff) | |
| download | linux-7e567b44e6c59ad8bec321afb03302ffb1e6dda6.tar.gz linux-7e567b44e6c59ad8bec321afb03302ffb1e6dda6.tar.bz2 linux-7e567b44e6c59ad8bec321afb03302ffb1e6dda6.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2: Change repository in MAINTAINERS.
ocfs2: Fix a missing credit when deleting from indexed directories.
ocfs2/trivial: Remove unused variable in ocfs2_rename.
ocfs2: Add missing iput() during error handling in ocfs2_dentry_attach_lock()
ocfs2: Fix some printk() warnings.
ocfs2: Fix 2 warning during ocfs2 make.
ocfs2: Reserve 1 more cluster in expanding_inline_dir for indexed dir.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 066644a8fbcb..9de961bd1214 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4189,7 +4189,7 @@ P: Joel Becker M: joel.becker@oracle.com L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers) W: http://oss.oracle.com/projects/ocfs2/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git S: Supported F: Documentation/filesystems/ocfs2.txt F: Documentation/filesystems/dlmfs.txt |