projects / platform / kernel / linux-exynos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0c6fbe 123f3e1)
Merge branch 'x86/asm' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Fri, 25 Sep 2009 08:45:32 +0000 (10:45 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 25 Sep 2009 08:47:00 +0000 (10:47 +0200)
Merge reason: The linker script cleanups are ready for upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/kernel/head_32.S patch | diff1 | diff2 | blob | history
arch/x86/kernel/traps.c patch | diff1 | diff2 | blob | history
arch/x86/kernel/vmlinux.lds.S patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/head_32.S
Simple merge
diff --cc arch/x86/kernel/traps.c
Simple merge
diff --cc arch/x86/kernel/vmlinux.lds.S
Simple merge
Domain: System / Kernel;