diff options
| author | LaMont Jones <lamont@debian.org> | 2010-08-02 23:02:28 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2010-08-02 23:02:28 -0600 |
| commit | 0864d694ca05ea9383ef09bc1bc3a182e15e2ffa (patch) | |
| tree | 2e5237f1d4e2cac2efad97ce31abc386c1e37b6d /misc-utils/blkid.8 | |
| parent | 3cbdfd84fde6159d7778e70618fbbc8df219cafe (diff) | |
| parent | 6c91f5e3e1de32c45ea0b38227ce35eb43eb2ebc (diff) | |
| download | util-linux-old-0864d694ca05ea9383ef09bc1bc3a182e15e2ffa.tar.gz | |
Merge remote branch 'origin/master'
Conflicts:
mount/Makefile.am
sys-utils/ipcs.c
tests/ts/blkid/images-fs/befs.img.bz2
tests/ts/blkid/images-fs/ddf-raid.img.bz2
Diffstat (limited to 'misc-utils/blkid.8')
| -rw-r--r-- | misc-utils/blkid.8 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/misc-utils/blkid.8 b/misc-utils/blkid.8 index d42074f0..8968bb29 100644 --- a/misc-utils/blkid.8 +++ b/misc-utils/blkid.8 @@ -33,8 +33,6 @@ blkid \- command\-line utility to locate/print block device attributes .B blkid .RB -p -.RB [ \-s -.IR tag ] .RB [ \-O .IR offset ] .RB [ \-S @@ -54,8 +52,6 @@ blkid \- command\-line utility to locate/print block device attributes .B blkid .RB -i -.RB [ \-s -.IR tag ] .RB [ \-o .IR format ] .RB [ \-s |