Merge branch 'build_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Oct 2008 15:08:57 +0000 (08:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Oct 2008 15:08:57 +0000 (08:08 -0700)
commiteae82541cf62cd8b585377d799335b8f9a701c4a
treefebe479f3e9f9c4f7c69bc9bebd36d2f7c6b7437
parent5f2434a66dfa4701b81b79a78eaf9c32da0f8839
parent1efd47f87317030cb7e37821b8562a8162c1223f
Merge branch 'build_fix' of git://git./linux/kernel/git/mfasheh/ocfs2

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