From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 17 Dec 2008 12:24:52 +0000 (+0100)
Subject: Merge branch 'x86/crashdump' into cpus4096
X-Git-Tag: v2.6.29-rc1~538^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=855caa37b9b61c1ccfeb91a2bc04d90bfc5e4525;p=pandora-kernel.git

Merge branch 'x86/crashdump' into cpus4096

Conflicts:
	arch/x86/kernel/crash.c

Merged for semantic conflict:
	arch/x86/kernel/reboot.c
---

855caa37b9b61c1ccfeb91a2bc04d90bfc5e4525
Reading git-diff-tree failed