From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 16 Mar 2009 08:12:42 +0000 (+0100)
Subject: Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/core
X-Git-Tag: v2.6.30-rc1~2^2~32
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7243f2145a9b06e5cf9a49fc9b8b9a4fff6fb42e;p=pandora-kernel.git

Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/core

Conflicts:
	arch/parisc/kernel/irq.c
---

7243f2145a9b06e5cf9a49fc9b8b9a4fff6fb42e
Reading git-diff-tree failed