tree 69bd0681b33bd12b8b5961af88ad3452afdf7b89
parent a8375bd81cf99cb81be37127eaf08316ecb87619
parent 00377d8e3842776d1da633ad9c79a16ecb548b92
author Linus Torvalds <torvalds@linux-foundation.org> 1211296518 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1211296518 -0700

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