diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-23 16:56:37 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-23 16:56:37 +0000 |
| commit | 250e8659c56d94320b877f659be45b8de130fa31 (patch) | |
| tree | 71095fcd0b70a869ffc2589ec72bf2334b0643a6 /Kconfig | |
| parent | 7adf3d9a27e4838d0af9250c53ad5744b84886ce (diff) | |
| parent | c7aae4d46ea5c7fb51edd68839588967ef2a7536 (diff) | |
Merge remote-tracking branch 'lsk/v3.14/topic/arm64-efi' into linux-linaro-lsk-v3.14lsk-v3.14-15.01
Conflicts:
arch/arm64/kernel/Makefile
drivers/firmware/efi/efi-stub-helper.c
Diffstat (limited to 'Kconfig')
0 files changed, 0 insertions, 0 deletions