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)
commitdf91c3513f9a1da5388a5d5972fe4f777fe0d516
tree39c44a690d42d5a3cc521d8fd34c3eb6916452cf
parentb52e0a7c4e4100f8683af508664e60e1603070f9
parentb8cb62f82103083a6e8fa5470bfe634a2c06514d
Merge tag 'efi-urgent' into x86/urgent

 * 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>