From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 19 Jul 2007 21:16:44 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... 
X-Git-Tag: v3.12-rc1~27854
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f745bb1c73e2395e6b9961d4d915a8f8e2cd32cd;p=kernel%2Fkernel-generic.git

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: ->fallocate() support
---

f745bb1c73e2395e6b9961d4d915a8f8e2cd32cd