From: Ingo Molnar Date: Tue, 23 Sep 2008 11:26:27 +0000 (+0200) Subject: Merge branch 'x86/signal' into core/signal X-Git-Tag: v2.6.28-rc1~699^2^2^2~4 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=101d5b713700b902b1c200cdd1925c3cb7d34567;p=pandora-kernel.git Merge branch 'x86/signal' into core/signal Conflicts: arch/x86/kernel/cpu/feature_names.c arch/x86/kernel/setup.c drivers/pci/intel-iommu.c include/asm-x86/cpufeature.h Signed-off-by: Ingo Molnar --- 101d5b713700b902b1c200cdd1925c3cb7d34567 Reading git-diff-tree failed