]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'arnds-jiffies-fix' into fortglx/3.7/time
authorJohn Stultz <john.stultz@linaro.org>
Fri, 28 Sep 2012 22:00:27 +0000 (18:00 -0400)
committerJohn Stultz <john.stultz@linaro.org>
Fri, 28 Sep 2012 22:00:27 +0000 (18:00 -0400)
commit28f2b02bc581ffc835bc1691b18d03f62fcf0395
tree94205c22ecc0c1d0a792f610cfd7e63967227ea8
parent650ea02475106e8d6bdf561896d2ffe0d1c0ebb4
parent015a830d44695adff8b52d2703608cec4a1041ba
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>
include/linux/jiffies.h