From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 23 Dec 2010 00:00:21 +0000 (-0500)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.41.90.wc1~11
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=da2a5a4baede2a227d2da587eb74ceae66778fbc;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	resize/resize2fs.c
---

da2a5a4baede2a227d2da587eb74ceae66778fbc