From: H. Peter Anvin <hpa@linux.intel.com>
Date: Sat, 20 Apr 2013 16:16:44 +0000 (-0700)
Subject: Merge remote-tracking branch 'efi/chainsaw' into x86/efi
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~75^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f53f292eeaa234615c31a1306babe703fc4263f2;p=pandora-kernel.git

Merge remote-tracking branch 'efi/chainsaw' into x86/efi

Resolved Conflicts:
	drivers/firmware/efivars.c
	fs/efivarsfs/file.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---

f53f292eeaa234615c31a1306babe703fc4263f2
Reading git-diff-tree failed