projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b5b94e d91dfbb)
Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 20 Apr 2009 16:08:07 +0000 (18:08 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 20 Apr 2009 16:08:12 +0000 (18:08 +0200)
Merge reason: We need the x86/uv updates from upstream, to queue up
              dependent fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
Documentation/kernel-parameters.txt patch | diff1 | diff2 | blob | history
arch/x86/kernel/apic/x2apic_uv_x.c patch | diff1 | diff2 | blob | history

diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/x86/kernel/apic/x2apic_uv_x.c
Simple merge