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: 7501ce3 bcb942c)

author	Theodore Ts'o <tytso@mit.edu>
	Sun, 5 Jun 2011 00:24:36 +0000 (20:24 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Sun, 5 Jun 2011 00:24:36 +0000 (20:24 -0400)
commit	6a6337c3df7c982eb888764d585ec483a51af16e
tree	fb137967bee7878687c6561f48d4f4f8ceae2711	tree \| snapshot
parent	7501ce3ee331b7cdb965ab95036090f2de91b5e0	commit \| diff
parent	bcb942c2013a92ff9a627ee79f14e52dba097538	commit \| diff

Merge branch 'maint' into next

Conflicts:
lib/ext2fs/bitmaps.c
lib/ext2fs/rw_bitmaps.c
misc/dumpe2fs.c

lib/ext2fs/bitmaps.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2_fs.h	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2fs.h	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/initialize.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/openfs.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/rw_bitmaps.c	diff1 \|	diff2 \|	blob \| history
misc/dumpe2fs.c	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	diff1 \|	diff2 \|	blob \| history

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