tree 566d03e2a4f6b42dab9628cd82c93cd61d587467
parent 1cc4fff0b360aeffeedb7d6db5089d88dd861700
parent 3c92ec8ae91ecf59d88c798301833d7cf83f2179
author Ingo Molnar <mingo@elte.hu> 1230540178 +0100
committer Ingo Molnar <mingo@elte.hu> 1230543427 +0100

Merge branch 'linus' into timers/hrtimers

Conflicts:
	sound/drivers/pcsp/pcsp.c

Semantic conflict:

        sound/core/hrtimer.c