From: Karel Zak <kzak@redhat.com>
Date: Wed, 29 Jun 2011 10:12:48 +0000 (+0200)
Subject: Merge branch 'sfdisk' of git://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.20-rc1~131
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa41c8b5308c14a166224beee010b119bd31d90c;p=thirdparty%2Futil-linux.git

Merge branch 'sfdisk' of git://github.com/kerolasa/lelux-utiliteetit

* 'sfdisk' of git://github.com/kerolasa/lelux-utiliteetit:
  Merge branch 'master', remote-tracking branch 'upstream/master'
  sfdisk: fix for data type mismatches
  sfdisk: fix implicit overflow
  docs: sfdisk manual update
  sfdisk: previously undocumented options to usage
  sfdisk: help screen format
  sfdisk: declare unused function attributes
---

fa41c8b5308c14a166224beee010b119bd31d90c