From: Ingo Molnar Date: Wed, 18 Mar 2009 12:19:49 +0000 (+0100) Subject: Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86... X-Git-Tag: v2.6.30-rc1~211^2~21 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=705bb9dc72b2464a7e421ee45d5e4a3f206d5c75;p=pandora-kernel.git Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86/mtrr', 'x86/setup', 'x86/setup-memory', 'x86/urgent', 'x86/uv', 'x86/x2apic' and 'linus' into x86/core Conflicts: arch/parisc/kernel/irq.c --- 705bb9dc72b2464a7e421ee45d5e4a3f206d5c75 Reading git-diff-tree failed