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

Merge commit 'v2.6.29-rc1' into timers/hrtimers

Conflicts:
	kernel/time/tick-common.c
parents 5762ba18 c5976504
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