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~76^2^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d0859cef29167d45dc6cf89d19712145e6005d6;p=pandora-kernel.git

Merge branch 'sched/clock' into tracing/ftrace

Conflicts:
	kernel/sched_clock.c
---

5d0859cef29167d45dc6cf89d19712145e6005d6
Reading git-diff-tree failed