Whamcloud - gitweb
git://git.whamcloud.com / tools / e2fsprogs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfb1d42 9aa109c)
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Tue, 3 Jun 2008 01:40:02 +0000 (21:40 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 3 Jun 2008 01:40:02 +0000 (21:40 -0400)
1  2 
lib/blkid/probe.c patch | diff1 | diff2 | blob | history

diff --cc lib/blkid/probe.c
Simple merge
Mirror of git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git