From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 17 Jun 2009 10:52:15 +0000 (+0200)
Subject: Merge branch 'linus' into tracing/hw-breakpoints
X-Git-Tag: v2.6.33-rc1~399^2~146^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eadb8a091b27a840de7450f84ecff5ef13476424;p=pandora-kernel.git

Merge branch 'linus' into tracing/hw-breakpoints

Conflicts:
	arch/x86/Kconfig
	arch/x86/kernel/traps.c
	arch/x86/power/cpu.c
	arch/x86/power/cpu_32.c
	kernel/Makefile

Semantic conflict:
	arch/x86/kernel/hw_breakpoint.c

Merge reason: Resolve the conflicts, move from put_cpu_no_sched() to
              put_cpu() in arch/x86/kernel/hw_breakpoint.c.

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

eadb8a091b27a840de7450f84ecff5ef13476424
Reading git-diff-tree failed