Merge branch 'fortglx/3.12/time' into fortglx/3.13/time
authorJohn Stultz <john.stultz@linaro.org>
Tue, 17 Sep 2013 01:54:07 +0000 (18:54 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Tue, 17 Sep 2013 01:54:07 +0000 (18:54 -0700)
commit389e067032fbb96e439abafae848dd447e4cafb4
tree9b5fdebaf55ad4e9d195412dbfbf10a7a8042aea
parent19c3205ceaffc8f860acf61537fa211087e4b8fc
parenta97ad0c4b447a132a322cedc3a5f7fa4cab4b304
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>
kernel/time/clocksource.c