Merge tag 'efi-urgent' into x86/urgent
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 21 Jun 2013 10:01:21 +0000 (03:01 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 21 Jun 2013 10:01:21 +0000 (03:01 -0700)
 * Don't leak random kernel memory to EFI variable NVRAM when attempting
   to initiate garbage collection. Also, free the kernel memory when
   we're done with it instead of leaking - Ben Hutchings

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

Trivial merge