Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jul 2015 18:26:13 +0000 (11:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jul 2015 18:26:13 +0000 (11:26 -0700)
commitd61be4b3f2684b6d76ef8c1d28ecdeb9bb20fa8f
treed87c3b49ecaf4fb2c567b8aca6a6738728d70fa1
parent67eb890e5e132b56d9af7adf407e7c2a6ed248dc
parentf91b1feada0b6f0a4d33648155b3ded2c4e0707e
Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux

Pull arm64 fix from Catalin Marinas:
 "Fix buffer overflow when UTF-16 UEFI vendor string is copied from the
  system table into a char array with a size of 100 bytes"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64/efi: map the entire UEFI vendor string before reading it