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

Merge branch 'linus' into timers/hrtimers 

Conflicts:
	sound/drivers/pcsp/pcsp.c

Semantic conflict:

        sound/core/hrtimer.c
parents 1cc4fff0 3c92ec8a
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment