]> git.ipfire.org Git - thirdparty/util-linux.git/commit - libblkid/src/topology/ioctl.c
Merge branch 'master', remote-tracking branch 'upstream/master' into sfdisk
authorSami Kerola <kerolasa@iki.fi>
Thu, 16 Jun 2011 19:44:24 +0000 (21:44 +0200)
committerSami Kerola <kerolasa@iki.fi>
Thu, 16 Jun 2011 19:44:24 +0000 (21:44 +0200)
commitd5251274a9dc84730914e77156b7dfa20c61319e
tree7de3bb7210a5b874e9b699c3791deeb69bc133eb
parentbdb8757e917d9bd86e1df50db7e4fb239baa2ca5
parent8c20c0ad4ae3c520f78faa190fb852bc1a3b8b16
parent376df2c9e67faa05665b6346e4a33bb44873f87b
Merge branch 'master', remote-tracking branch 'upstream/master' into sfdisk