From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Sep 2009 20:38:37 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec... 
X-Git-Tag: v2.6.31-rc9~20
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ac7ac9f2b9bfd9b68a1571d27e4c8bebb4788914

Merge branch 'upstream-linus' of git://git./linux/kernel/git/jlbec/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2: ocfs2_write_begin_nolock() should handle len=0
  ocfs2: invalidate dentry if its dentry_lock isn't initialized.
---

ac7ac9f2b9bfd9b68a1571d27e4c8bebb4788914