]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit4ec909f6f3eff2ff20a02ab053597a9f67eb8942
tree9b5fdebaf55ad4e9d195412dbfbf10a7a8042aea
parent5c68a0cbbd1923d654363dd9e899d6ba26527249
parent7f4092028974c16159c304658c13a6f845086079
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