From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Oct 2008 15:08:57 +0000 (-0700)
Subject: Merge branch 'build_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh... 
X-Git-Tag: v2.6.28-rc1~568
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eae82541cf62cd8b585377d799335b8f9a701c4a;p=linux-2.6-omap-h63xx.git

Merge branch 'build_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

* 'build_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: fix build error
---

eae82541cf62cd8b585377d799335b8f9a701c4a