]> err.no Git - util-linux/commitdiff
Merge remote branch 'origin/master'
authorLaMont Jones <lamont@debian.org>
Mon, 19 Oct 2009 13:58:11 +0000 (07:58 -0600)
committerLaMont Jones <lamont@debian.org>
Mon, 19 Oct 2009 13:58:11 +0000 (07:58 -0600)
Conflicts:
mount/lomount.c

1  2 
hwclock/hwclock.c
mount/lomount.c

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