Merge commit 'v2.6.29-rc1' into timers/hrtimers
authorIngo Molnar <mingo@elte.hu>
Mon, 12 Jan 2009 10:32:03 +0000 (11:32 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 12 Jan 2009 10:32:03 +0000 (11:32 +0100)
commite3ee1e123183ca9847e74b7b8e2694c9e3b817a6
tree652a84674ed05eaa46a813de2223af0bd0168a5a
parent5762ba1873b0bb9faa631aaa02f533c2b9837f82
parentc59765042f53a79a7a65585042ff463b69cb248c
Merge commit 'v2.6.29-rc1' into timers/hrtimers

Conflicts:
kernel/time/tick-common.c
include/linux/clockchips.h
kernel/hrtimer.c
kernel/time/tick-common.c