Android SDK
  1. Android SDK

linux-imx

Public

Commits

Ingo Molnar
5c12af0c41e + d6e0a2dd12f
Ingo Molnar committed ef0b8b9a521M
Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts

Conflicts:
	arch/x86/platform/efi/efi.c
	drivers/firmware/efi/Kconfig

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