From: Karel Zak <kzak@redhat.com>
Date: Tue, 20 May 2014 08:23:18 +0000 (+0200)
Subject: Merge branch 'cramfs-blocksize' of https://github.com/rudimeier/util-linux
X-Git-Tag: v2.25-rc1~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=052ed36edd0ee3867eb0219b0f1ccedbf2ef9de1;p=thirdparty%2Futil-linux.git

Merge branch 'cramfs-blocksize' of https://github.com/rudimeier/util-linux

* 'cramfs-blocksize' of https://github.com/rudimeier/util-linux:
  mkfs.cramfs: fix crash when -b 0
  fsck.cramfs: update man page (--extract and --blocksize)
  tests: remove test_fsck.cramfs (reverts 6c32ae78)
  fsck.cramfs: remove define INCLUDE_FS_TESTS
  fsck.cramfs: refactor option -x/--extract
  tests: fix fsck.cramfs for systems with certain page sizes
  fsck.cramfs: add option --blocksize
  fsck.cramfs: rename variable page_size to blksize
  fsck.cramfs: ifdef unused outbuffer and page_size
  fsck.cramfs: allow smaller superblock sizes
  tests, fix cramfs for systems with certain page sizes
---

052ed36edd0ee3867eb0219b0f1ccedbf2ef9de1