]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'x86/efi'
authorIngo Molnar <mingo@kernel.org>
Tue, 24 Jul 2012 12:03:07 +0000 (14:03 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 24 Jul 2012 12:03:07 +0000 (14:03 +0200)
1  2 
Documentation/x86/boot.txt
arch/x86/boot/header.S
arch/x86/mm/pageattr.c
init/main.c

Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge