]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'next' into efi-next-merge
authorMatt Fleming <matt.fleming@intel.com>
Fri, 3 Oct 2014 21:15:56 +0000 (22:15 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Fri, 3 Oct 2014 21:15:56 +0000 (22:15 +0100)
commit8142184e690130aad1b8f9d0a318d71037501eed
treee607db32fd303246ee9b93af83a611fc7b93479a
parent6db42dbacd438e9b3f81bce794b95c097019e378
parenta36916b13d83ff1cffe5b4f02780a145f9b2f611
Merge branch 'next' into efi-next-merge

Conflicts:
arch/x86/boot/compressed/eboot.c
Documentation/kernel-parameters.txt
arch/arm64/kernel/efi.c
arch/x86/boot/compressed/eboot.c
arch/x86/include/asm/efi.h
drivers/firmware/efi/vars.c
drivers/rtc/rtc-efi.c