Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time

Browse source

Merge in 64bit sched_clock support that missed 3.12.

Conflicts:
	kernel/time/sched_clock.c

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

...

This commit is contained in:

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

parent 272b98c645 e7e3ff1bfe

commit 19c3205cea

4 changed files with 95 additions and 65 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

2

include/linux/clocksource.h

View file

2

include/linux/sched_clock.h

View file