]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'x86/efi'
authorIngo Molnar <mingo@kernel.org>
Sat, 12 Oct 2013 17:18:54 +0000 (19:18 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 12 Oct 2013 17:18:54 +0000 (19:18 +0200)
1  2 
arch/x86/Kconfig
arch/x86/platform/efi/efi.c

Simple merge
Simple merge