Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

* '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.

diff --cc MAINTAINERS
index 066644a,7625387..9de961b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4189,11 -3335,8 +4189,11 @@@ P:    Joel Becke
  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
 +F:    fs/ocfs2/
  
  ORINOCO DRIVER
  P:    Pavel Roskin