From: Ingo Molnar Date: Sun, 12 Oct 2008 10:43:21 +0000 (+0200) Subject: Merge branch 'linus' into x86/quirks X-Git-Tag: v2.6.28-rc1~699^2^10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acbaa41a780490c791492c41144c774c04875af1;p=pandora-kernel.git Merge branch 'linus' into x86/quirks Conflicts: arch/x86/kernel/early-quirks.c --- acbaa41a780490c791492c41144c774c04875af1 Reading git-diff-tree failed