From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 6 Apr 2009 07:02:57 +0000 (+0200)
Subject: Merge branch 'linus' into perfcounters/core-v2
X-Git-Tag: v2.6.31-rc1~383^2~484
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f541ae326fa120fa5c57433e4d9a133df212ce41;p=pandora-kernel.git

Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
	arch/powerpc/kernel/Makefile
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/hardirq.h
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/irq.c
	arch/x86/kernel/syscall_table_32.S
	arch/x86/mm/iomap_32.c
	include/linux/sched.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

f541ae326fa120fa5c57433e4d9a133df212ce41
Reading git-diff-tree failed