From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 29 Dec 2008 08:45:15 +0000 (+0100)
Subject: Merge branch 'linus' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2~534
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1df957670aef74ffd9a4ad93e6d2c90bf6b4845;p=pandora-kernel.git

Merge branch 'linus' into perfcounters/core

Conflicts:
	fs/exec.c
	include/linux/init_task.h

Simple context conflicts.
---

e1df957670aef74ffd9a4ad93e6d2c90bf6b4845
Reading git-diff-tree failed