git://git.whamcloud.com - tools/e2fsprogs.git/commit

Whamcloud - gitweb

git://git.whamcloud.com / tools / e2fsprogs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e6a4571 740837d)

author	Theodore Ts'o <tytso@mit.edu>
	Mon, 17 Dec 2007 15:28:01 +0000 (10:28 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 17 Dec 2007 15:28:01 +0000 (10:28 -0500)
commit	b689b8dd14e69c652d2c8211bdef3effe81cfd65
tree	3917bfb935f6a11aea16af0934b1d7fdc9be0b52	tree \| snapshot
parent	e6a4571eec5ce0e75fb8a5a41c30bf0e68d90efe	commit \| diff
parent	740837def7fc55ba6b0368f46a4b4abcaba0becd	commit \| diff

Merge branch 'maint' into next

Conflicts:

lib/ext2fs/closefs.c

configure	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
debian/rules	diff1 \|	diff2 \|	blob \| history
lib/blkid/probe.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/closefs.c	diff1 \|	diff2 \|	blob \| history
misc/Makefile.in	diff1 \|	diff2 \|	blob \| history

Mirror of git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git