]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Feb 2014 23:02:28 +0000 (15:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Feb 2014 23:02:28 +0000 (15:02 -0800)
Pull x86 EFI fixes from Peter Anvin:
 "A few more EFI-related fixes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/efi: Check status field to validate BGRT header
  x86/efi: Fix 32-bit fallout


Trivial merge