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)
Conflicts:
kernel/time/tick-common.c


Trivial merge