Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 15:15:18 +0000 (08:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 15:15:18 +0000 (08:15 -0700)
commit551395ae667d699189014f762355e9131fc03e79
tree69bd0681b33bd12b8b5961af88ad3452afdf7b89
parenta8375bd81cf99cb81be37127eaf08316ecb87619
parent00377d8e3842776d1da633ad9c79a16ecb548b92
Merge git://git./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