From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 22 Aug 2014 08:04:15 +0000 (+0200)
Subject: Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming... 
X-Git-Tag: v3.17-rc2~5^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=80b304fd00e8b667775ff791121b61ecd7cd0c03;p=~emulex%2Finfiniband.git

Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent

Pull EFI fixes from Matt Fleming:

 * WARN_ON(!spin_is_locked()) always triggers on non-SMP machines.
   Swap it for the more canonical lockdep_assert_held() which always
   does the right thing - Guenter Roeck

 * Assign the correct value to efi.runtime_version on arm64 so that all
   the runtime services can be invoked - Semen Protsenko

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

80b304fd00e8b667775ff791121b61ecd7cd0c03