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)
commit75b128573b275d5a5a7210b98c4b8cb3b39c12e7
treee607db32fd303246ee9b93af83a611fc7b93479a
parentfe82dcec644244676d55a1384c958d5f67979adb
parent7efe665903d0d963b0ebf4cab25cc3ae32c62600
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