Merge branch 'x86/efi'
commitb8058b1d5ea64cdcf3a6d2fc23b80e25663c939b
authorIngo Molnar <mingo@elte.hu>
Tue, 5 Jul 2011 11:40:47 +0000 (5 13:40 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 5 Jul 2011 11:40:47 +0000 (5 13:40 +0200)
treed5f9ecb1c0d6032f0b0d759249ecf26f1d66f8f8
parent53fd9380675d90d60eb4cfbe6ae65064c60f4065
parentd80603c9d876efafd8b07469c891076de470e323
Merge branch 'x86/efi'
arch/x86/platform/efi/efi.c