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)
* 'build_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: fix build error


Trivial merge