Merge branch 'arnds-jiffies-fix' into fortglx/3.7/time

Browse source

Sort out conflict with Arnd's patch that preserves
the unconditional LATCH value.

Signed-off-by: John Stultz <john.stultz@linaro.org>

...

This commit is contained in:

John Stultz 2012-09-28 18:00:27 -04:00

parent 650ea02475 015a830d44

commit 28f2b02bc5

1 changed files with 3 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

include/linux/jiffies.h

View file