Fixes merge for commit 2ed1d70 that clobbered commit 98ac774 Signed-off-by: J William Piggott <elseifthen@xxxxxxx> --- The following changes since commit 4bb82a455461e42644c9b3d8aa1206ad8889ed35: libfdisk: (gpt) cleanup header size usage (2015-01-09 13:05:49 +0100) are available in the git repository at: git@xxxxxxxxxx:jwpi/util-linux.git man sys-utils/hwclock.8.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-utils/hwclock.8.in b/sys-utils/hwclock.8.in index 20a8dd0..74a3146 100644 --- a/sys-utils/hwclock.8.in +++ b/sys-utils/hwclock.8.in @@ -783,7 +783,7 @@ synchronizes the System Clock. .PP If your system runs with \%'11\ minute\ mode' on, it may need to use either .BR \%\-\-hctosys " or " \%\-\-systz -in a startup script, especially if the Hardware Clock is configured to to use +in a startup script, especially if the Hardware Clock is configured to use the local timescale. Unless the kernel is informed of what timescale the Hardware Clock is using, it may clobber it with the wrong one. The kernel uses UTC by default. -- To unsubscribe from this list: send the line "unsubscribe util-linux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
