]> err.no Git - util-linux/commit
Merge commit 'origin/master'
authorLaMont Jones <lamont@debian.org>
Thu, 8 Nov 2007 03:07:28 +0000 (20:07 -0700)
committerLaMont Jones <lamont@debian.org>
Thu, 8 Nov 2007 03:07:28 +0000 (20:07 -0700)
commit1f937562329c8cb09b5b6270474d2f02ef95792b
treecdf12b906483791d1c7940246c4449c594232db6
parent5d7cd0e416dacfa620939f0e6ca3dd95d16ea230
parent3bbc9320791e2768eb0ddda3823cb55ad63f79e1
Merge commit 'origin/master'

Conflicts:

mount/Makefile.am
mount/my_dev_t.h
fdisk/sfdisk.c
mount/Makefile.am
mount/mount.c
sys-utils/Makefile.am
sys-utils/setarch.c