| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 2 May 2009 23:30:47 +0000 (16:30 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 2 May 2009 23:30:47 +0000 (16:30 -0700) | ||
| commit | 7e567b44e6c59ad8bec321afb03302ffb1e6dda6 | |
| tree | bd02466f931a471691db1da47d6d072924cfef1f | tree | snapshot (tar.xz tar.gz zip) |
| parent | 020f932bd246e9d595f7a006250762d98ffeab46 | commit | diff |
| parent | 2191aebaf9af9125bfee32808babe6f61446c8a6 | commit | diff |
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.
* '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.
| MAINTAINERS | diff1 | | diff2 | | blob | history |