From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 12 Jan 2009 10:32:03 +0000 (+0100)
Subject: Merge commit 'v2.6.29-rc1' into timers/hrtimers
X-Git-Tag: v2.6.30-rc1~657^2~3^4~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3ee1e123183ca9847e74b7b8e2694c9e3b817a6;p=pandora-kernel.git

Merge commit 'v2.6.29-rc1' into timers/hrtimers

Conflicts:
	kernel/time/tick-common.c
---

e3ee1e123183ca9847e74b7b8e2694c9e3b817a6
Reading git-diff-tree failed