From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 May 2008 15:15:18 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
X-Git-Tag: v2.6.26-rc4~102
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=551395ae667d699189014f762355e9131fc03e79;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  [GFS2] Prefer strlcpy() over snprintf()
  [GFS2] Fix cast from unsigned int to s64
  [GFS2] filesystem consistency error from do_strip
---

551395ae667d699189014f762355e9131fc03e79