Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 9 Jun 2007 02:44:16 +0000 (19:44 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 9 Jun 2007 02:44:16 +0000 (19:44 -0700)
commit845a2fdcbd5bc5b9f652201ee95c825827a1d521
treec7dec1efdb7900c4e10331fbab2add44ade5e1bc
parent81d84a94be8085475c3585596e52b06ccbedd922
parenteeb47d1234af1a9267836f680a8e114b2e88d0dc
Merge branch 'upstream-linus' of git://git./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