projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca4dbc6 eb5b379)
Merge branch 'x86/urgent' into x86/irq
authorH. Peter Anvin <hpa@zytor.com>
Sun, 21 Feb 2010 05:51:42 +0000 (21:51 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 21 Feb 2010 06:54:05 +0000 (22:54 -0800)
Merge reason: conflict in arch/x86/kernel/apic/io_apic.c

Resolved Conflicts:
arch/x86/kernel/apic/io_apic.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
1  2 
arch/x86/kernel/apic/io_apic.c patch | diff1 | diff2 | blob | history
arch/x86/kernel/smpboot.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge
diff --cc arch/x86/kernel/smpboot.c
Simple merge