commit | 389e067032fbb96e439abafae848dd447e4cafb4 | [log] [tgz] |
---|---|---|
author | John Stultz <john.stultz@linaro.org> | Mon Sep 16 18:54:07 2013 -0700 |
committer | John Stultz <john.stultz@linaro.org> | Mon Sep 16 18:54:07 2013 -0700 |
tree | 9b5fdebaf55ad4e9d195412dbfbf10a7a8042aea | |
parent | 19c3205ceaffc8f860acf61537fa211087e4b8fc [diff] | |
parent | a97ad0c4b447a132a322cedc3a5f7fa4cab4b304 [diff] |
Merge branch 'fortglx/3.12/time' into fortglx/3.13/time Merge in the timekeeping changes that missed 3.12 Signed-off-by: John Stultz <john.stultz@linaro.org>