tree bd02466f931a471691db1da47d6d072924cfef1f
parent 020f932bd246e9d595f7a006250762d98ffeab46
parent 2191aebaf9af9125bfee32808babe6f61446c8a6
author Linus Torvalds <torvalds@linux-foundation.org> 1241307047 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1241307047 -0700

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.