Skip to content
Commit 367177e5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'formingo/3.2/tip/timers/core' of... 

Merge branch 'formingo/3.2/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core

Conflicts:
	kernel/time/timekeeping.c
parents c2bc1111 d65670a7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment