git.stricted.de - GitHub/LineageOS/android_kernel_samsung

projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit

author	Ingo Molnar <mingo@kernel.org>
	Fri, 26 Oct 2012 08:17:38 +0000 (10:17 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Fri, 26 Oct 2012 08:17:38 +0000 (10:17 +0200)
commit	8b724e2a12d553cad8ad412846511c783a92d25e
tree	a07e14802a768a7156f70e2f9550ff98fe2b17f1	tree \| snapshot (tar.gz zip)
parent	f82f64dd9f485e13f29f369772d4a0e868e5633a	commit \| diff
parent	5189c2a7c7769ee9d037d76c1a7b8550ccf3481c	commit \| diff

Merge tag 'efi-for-3.7' of git://git./linux/kernel/git/mfleming/efi into x86/urgent

Pull EFI fixes from Matt Fleming:

"Fix oops with EFI variables on mixed 32/64-bit firmware/kernels and
document EFI git repository location on kernel.org."

Conflicts:
arch/x86/include/asm/efi.h

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/efi.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/efi.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi.c	diff1 \|	diff2 \|	blob \| history