]> err.no Git - util-linux/commit
Merge commit 'origin/master'
authorLaMont Jones <lamont@debian.org>
Fri, 26 Oct 2007 12:48:18 +0000 (06:48 -0600)
committerLaMont Jones <lamont@debian.org>
Fri, 26 Oct 2007 12:48:18 +0000 (06:48 -0600)
commit4f3b9d4acca24271d3e2ababf7d91a0a77b94027
treeefac9785b1fb9cae22b1467816237fb931b9d0ec
parentbe2fa82d6882d74a858b6aea7e57a70212069876
parent32f7216b4c480e140a035c92319e527120d26616
Merge commit 'origin/master'

Conflicts:

mount/Makefile.am
mount/mount.c
fdisk/sfdisk.c
login-utils/agetty.c
mount/Makefile.am
mount/lomount.c
mount/lomount.h
mount/mount.c