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)
commit704daf55c7297e727021063cb5d8ba1c55b84426
tree15e7b49c69f1ba742ec5fb3a009e51e1564d6a75
parentb0c6fbe458183cc7e1cab17be6efcbe7e435bad3
parent123f3e1d76952759c0fc8b4fec55a3fc8084d56f
Merge branch 'x86/asm' into x86/urgent

Merge reason: The linker script cleanups are ready for upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/head_32.S
arch/x86/kernel/traps.c
arch/x86/kernel/vmlinux.lds.S