From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 11 Jun 2009 15:55:42 +0000 (+0200)
Subject: Merge branch 'linus' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=940010c5a314a7bd9b498593bc6ba1718ac5aec5;p=pandora-kernel.git

Merge branch 'linus' into perfcounters/core

Conflicts:
	arch/x86/kernel/irqinit.c
	arch/x86/kernel/irqinit_64.c
	arch/x86/kernel/traps.c
	arch/x86/mm/fault.c
	include/linux/sched.h
	kernel/exit.c
---

940010c5a314a7bd9b498593bc6ba1718ac5aec5
Reading git-diff-tree failed