Merge branch 'linus' into timers/hrtimers
authorIngo Molnar <mingo@elte.hu>
Mon, 29 Dec 2008 08:42:58 +0000 (09:42 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 29 Dec 2008 09:37:07 +0000 (10:37 +0100)
commit0ce74d9296c971b2355c26984ad0bc538e34dd6c
tree566d03e2a4f6b42dab9628cd82c93cd61d587467
parent1cc4fff0b360aeffeedb7d6db5089d88dd861700
parent3c92ec8ae91ecf59d88c798301833d7cf83f2179
Merge branch 'linus' into timers/hrtimers

Conflicts:
sound/drivers/pcsp/pcsp.c

Semantic conflict:

        sound/core/hrtimer.c
arch/x86/Kconfig
arch/x86/kernel/hpet.c
fs/exec.c
kernel/sched.c
kernel/trace/trace_sysprof.c
sound/core/hrtimer.c
sound/drivers/pcsp/pcsp.c