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

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

Conflicts:
	arch/x86/include/asm/efi.h
---

4fd69331ad227a4d8de26592d017b73e00caca9f
Reading git-diff-tree failed