From: Matt Fleming <matt.fleming@intel.com>
Date: Wed, 5 Mar 2014 18:15:37 +0000 (+0000)
Subject: Merge remote-tracking branch 'tip/x86/efi-mixed' into efi-for-mingo
X-Git-Tag: v3.15-rc1~173^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=994448f1afa6689bafbebaf7412b23b541b41ef5;p=pandora-kernel.git

Merge remote-tracking branch 'tip/x86/efi-mixed' into efi-for-mingo

Conflicts:
	arch/x86/kernel/setup.c
	arch/x86/platform/efi/efi.c
	arch/x86/platform/efi/efi_64.c
---

994448f1afa6689bafbebaf7412b23b541b41ef5
Reading git-diff-tree failed