commit | 551395ae667d699189014f762355e9131fc03e79 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 20 08:15:18 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 20 08:15:18 2008 -0700 |
tree | 69bd0681b33bd12b8b5961af88ad3452afdf7b89 | |
parent | a8375bd81cf99cb81be37127eaf08316ecb87619 [diff] | |
parent | 00377d8e3842776d1da633ad9c79a16ecb548b92 [diff] |
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