projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb21b84 6a7519e)
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming...
authorIngo Molnar <mingo@kernel.org>
Fri, 22 Aug 2014 08:04:15 +0000 (10:04 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 22 Aug 2014 08:04:15 +0000 (10:04 +0200)
commit80b304fd00e8b667775ff791121b61ecd7cd0c03
treeb4f2ec59fe062c43343ee4c2f10a6bcd0e4dcd1btree | snapshot
parentfb21b84e7f809ef04b1e5aed5d463cf0d4866638commit | diff
parent6a7519e81321343165f89abb8b616df186d3e57acommit | diff
Merge tag 'efi-urgent' of git://git./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>
John Crispins staging tree