From: Ingo Molnar Date: Mon, 9 Feb 2009 23:41:02 +0000 (+0100) Subject: Merge branch 'x86/urgent' into core/percpu X-Git-Tag: v2.6.30-rc1~2^2~50^2~38 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92e2d508464b6293ad274fb606f766a458894142;p=pandora-kernel.git Merge branch 'x86/urgent' into core/percpu Conflicts: arch/x86/kernel/acpi/boot.c --- 92e2d508464b6293ad274fb606f766a458894142 Reading git-diff-tree failed