]> err.no Git - util-linux/commitdiff
Merge commit 'origin/master'
authorLaMont Jones <lamont@debian.org>
Wed, 9 Apr 2008 23:18:21 +0000 (17:18 -0600)
committerLaMont Jones <lamont@debian.org>
Wed, 9 Apr 2008 23:18:21 +0000 (17:18 -0600)
1  2 
hwclock/hwclock.8
mount/mount.c

Simple merge
diff --cc mount/mount.c
Simple merge