summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-09-16 18:54:07 -0700
committerJohn Stultz <john.stultz@linaro.org>2013-09-16 18:54:07 -0700
commit389e067032fbb96e439abafae848dd447e4cafb4 (patch)
tree9b5fdebaf55ad4e9d195412dbfbf10a7a8042aea /Makefile
parent19c3205ceaffc8f860acf61537fa211087e4b8fc (diff)
parenta97ad0c4b447a132a322cedc3a5f7fa4cab4b304 (diff)
downloadlinux-389e067032fbb96e439abafae848dd447e4cafb4.tar.bz2
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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions