Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming...
authorIngo Molnar <mingo@kernel.org>
Tue, 30 Jul 2013 18:50:33 +0000 (20:50 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 30 Jul 2013 18:50:33 +0000 (20:50 +0200)
commitf155b6303d938462aaa31a8c7d409f3ea9012713
tree1a927f9e20585f8edabb8369951add97bdaacd3e
parenteaa5a990191d204ba0f9d35dbe5505ec2cdd1460
parentdf981edcb9bce00b9c5e4f3cc33f3f98bc9a2394
Merge tag 'efi-urgent' of git://git./linux/kernel/git/mfleming/efi into x86/urgent

Pull EFI fix from Matt Fleming:

 * The size of memory that gets freed by free_pages() needs to be
   specified in pages, not bytes - by Roy Franz.

Signed-off-by: Ingo Molnar <mingo@kernel.org>