From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 9 Jun 2007 02:44:16 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... 
X-Git-Tag: v2.6.22-rc5~57
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=845a2fdcbd5bc5b9f652201ee95c825827a1d521;p=linux-2.6

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: Fix invalid assertion during write on 64k pages
  ocfs2: Fix masklog breakage
---

845a2fdcbd5bc5b9f652201ee95c825827a1d521