Merge pull request #2600 from poettering/s390-alarm-clock
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 13 Feb 2016 00:14:25 +0000 (19:14 -0500)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 13 Feb 2016 00:14:25 +0000 (19:14 -0500)
commit384de57271eef82e15a3088548817e629728d50e
treeeea5c491a248765d1eb1ab5de6d4baf46374295d
parent736ffecc9cf58a0d2c5f147a1f56f2c3532c10ce
parent32c1f5a57998f2a9e1992af006b83e39e3155830
Merge pull request #2600 from poettering/s390-alarm-clock

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