tree 94205c22ecc0c1d0a792f610cfd7e63967227ea8
parent 650ea02475106e8d6bdf561896d2ffe0d1c0ebb4
parent 015a830d44695adff8b52d2703608cec4a1041ba
author John Stultz <john.stultz@linaro.org> 1348869627 -0400
committer John Stultz <john.stultz@linaro.org> 1348869627 -0400

Merge branch 'arnds-jiffies-fix' into fortglx/3.7/time

Sort out conflict with Arnd's patch that preserves
the unconditional LATCH value.

Signed-off-by: John Stultz <john.stultz@linaro.org>