Merge branch 'x86/asm' into x86/mm
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Feb 2009 07:27:46 +0000 (08:27 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Feb 2009 07:27:46 +0000 (08:27 +0100)
commit95f66b3770d6d0755b4a2d818c237574ffd74e4c
tree61889ead58d8e262e6451c75194c3c68a21c4181
parent46cb27f5169d37be38be8e5729b9a0100e989fa8
parent9f331119a4f95a44d918fe6d5e85998fabf99b72
Merge branch 'x86/asm' into x86/mm
arch/x86/kernel/efi_stub_32.S
arch/x86/kernel/entry_64.S