From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 11 Jan 2009 01:42:53 +0000 (+0100)
Subject: Merge commit 'v2.6.29-rc1' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2~533
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=506c10f26c481b7f8ef27c1c79290f68989b2e9e;p=pandora-kernel.git

Merge commit 'v2.6.29-rc1' into perfcounters/core

Conflicts:
	include/linux/kernel_stat.h
---

506c10f26c481b7f8ef27c1c79290f68989b2e9e
Reading git-diff-tree failed