From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 13 Feb 2016 00:14:25 +0000 (-0500)
Subject: Merge pull request #2600 from poettering/s390-alarm-clock
X-Git-Tag: v230~367
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=384de57271eef82e15a3088548817e629728d50e;p=thirdparty%2Fsystemd.git

Merge pull request #2600 from poettering/s390-alarm-clock

time-util: map ALARM clockids to non-ALARM clockids in now()
---

384de57271eef82e15a3088548817e629728d50e