Merge branch 'fortglx/3.12/time' into fortglx/3.13/time

Browse source

Merge in the timekeeping changes that missed 3.12

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

...

This commit is contained in:

John Stultz 2013-09-16 18:54:07 -07:00

parent 19c3205cea a97ad0c4b4

commit 389e067032

3 changed files with 12 additions and 5 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

13

drivers/rtc/interface.c

View file

1

kernel/time/clocksource.c

View file

3

kernel/time/ntp.c

View file