From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 5 Jan 2014 11:34:29 +0000 (+0100)
Subject: Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts
X-Git-Tag: v3.14-rc1~163^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef0b8b9a521c65201bfca9747ee1bf374296133c;p=pandora-kernel.git

Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts

Conflicts:
	arch/x86/platform/efi/efi.c
	drivers/firmware/efi/Kconfig

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

ef0b8b9a521c65201bfca9747ee1bf374296133c
Reading git-diff-tree failed