]> err.no Git - util-linux/commit
Merge commit 'origin/master'
authorLaMont Jones <lamont@debian.org>
Mon, 15 Dec 2008 14:31:01 +0000 (07:31 -0700)
committerLaMont Jones <lamont@debian.org>
Mon, 15 Dec 2008 14:31:01 +0000 (07:31 -0700)
commit846992a5d1bdfb21f824cf82697ad978ffc121a8
tree924afdfee2767b9e183b830cd9139d2866568389
parent8ffc428676510ddb3a2e8f36b4b392468827cce3
parent9775d40fff67087f277a1aa9c33aa65b26041c4a
Merge commit 'origin/master'

Conflicts:

mount/mount.8
fdisk/cfdisk.8
hwclock/hwclock.c
mount/Makefile.am
mount/lomount.c
mount/mount.8
mount/mount.c
mount/swapon.c