git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Ingo Molnar <mingo@kernel.org>
	Sun, 5 Jan 2014 11:34:29 +0000 (12:34 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Sun, 5 Jan 2014 11:34:29 +0000 (12:34 +0100)
commit	7a4e9500feaf63de3cd1d4f569ed5a2348748e92
tree	644c3390c07d06fb7807182a4935f7c3f675b157	tree \| snapshot
parent	7a7df2f112df1f94c36e202ef940d8382cd3e574	commit \| diff
parent	0242b6e33e6b198789efabf5df3509fd30b67e8a	commit \| diff

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>

Linux Kernel Source Tree.

RSS Atom

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi.c	diff1 \|	diff2 \|	blob \| history
drivers/firmware/efi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/firmware/efi/Makefile	diff1 \|	diff2 \|	blob \| history
include/linux/efi.h	diff1 \|	diff2 \|	blob \| history