From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 23 Sep 2009 21:08:43 +0000 (+0200)
Subject: Merge commit 'linus/master' into tracing/kprobes
X-Git-Tag: v2.6.33-rc1~399^2~211
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7a4b414eed51f1653bb05ebe84122bf9a7ae18b;p=pandora-kernel.git

Merge commit 'linus/master' into tracing/kprobes

Conflicts:
	kernel/trace/Makefile
	kernel/trace/trace.h
	kernel/trace/trace_event_types.h
	kernel/trace/trace_export.c

Merge reason:
	Sync with latest significant tracing core changes.
---

d7a4b414eed51f1653bb05ebe84122bf9a7ae18b
Reading git-diff-tree failed