| commit | 28f2b02bc581ffc835bc1691b18d03f62fcf0395 | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Fri Sep 28 18:00:27 2012 -0400 |
| committer | John Stultz <john.stultz@linaro.org> | Fri Sep 28 18:00:27 2012 -0400 |
| tree | 94205c22ecc0c1d0a792f610cfd7e63967227ea8 | |
| parent | 650ea02475106e8d6bdf561896d2ffe0d1c0ebb4 [diff] | |
| parent | 015a830d44695adff8b52d2703608cec4a1041ba [diff] |
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>