From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 26 Feb 2009 20:21:59 +0000 (+0100)
Subject: Merge branch 'sched/clock' into tracing/ftrace
X-Git-Tag: v2.6.30-rc1~2^2~78
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b49061d400c9e51e3ac2aac026a099fe599b9bb;p=pandora-kernel.git

Merge branch 'sched/clock' into tracing/ftrace

Conflicts:
	kernel/sched_clock.c
---

1b49061d400c9e51e3ac2aac026a099fe599b9bb
Reading git-diff-tree failed