From: John Stultz <john.stultz@linaro.org>
Date: Tue, 17 Sep 2013 01:54:07 +0000 (-0700)
Subject: Merge branch 'fortglx/3.12/time' into fortglx/3.13/time
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~39^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=389e067032fbb96e439abafae848dd447e4cafb4;p=pandora-kernel.git

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>
---

389e067032fbb96e439abafae848dd447e4cafb4
Reading git-diff-tree failed