From: John Stultz <john.stultz@linaro.org>
Date: Fri, 28 Sep 2012 22:00:27 +0000 (-0400)
Subject: Merge branch 'arnds-jiffies-fix' into fortglx/3.7/time
X-Git-Tag: v3.7-rc1~35^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28f2b02bc581ffc835bc1691b18d03f62fcf0395;p=pandora-kernel.git

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

28f2b02bc581ffc835bc1691b18d03f62fcf0395
Reading git-diff-tree failed