From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sat, 27 Feb 2010 15:18:46 +0000 (+0100)
Subject: Merge commit 'v2.6.33' into perf/core
X-Git-Tag: v2.6.34-rc2~54^2~7^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=018cbffe6819f6f8db20a0a3acd9bab9bfd667e4;p=pandora-kernel.git

Merge commit 'v2.6.33' into perf/core

Merge reason:
	__percpu annotations need the corresponding sparse address
space definition upstream.

Conflicts:
	tools/perf/util/probe-event.c (trivial)
---

018cbffe6819f6f8db20a0a3acd9bab9bfd667e4
Reading git-diff-tree failed