From: Matt Fleming <matt.fleming@intel.com>
Date: Tue, 30 Apr 2013 10:30:24 +0000 (+0100)
Subject: Merge tag 'v3.9' into efi-for-tip2
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~75^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a614e1923d5389d01f3545ee4a90e39a04d0c90d;p=pandora-kernel.git

Merge tag 'v3.9' into efi-for-tip2

Resolve conflicts for Ingo.

Conflicts:
	drivers/firmware/Kconfig
	drivers/firmware/efivars.c

Signed-off-by: Matt Fleming <matt.fleming@intel.com>
---

a614e1923d5389d01f3545ee4a90e39a04d0c90d
Reading git-diff-tree failed