diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-24 22:54:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-24 22:54:49 +0100 |
| commit | bcddae4453f74e9d1dbc8db78c5c9bc552c600cb (patch) | |
| tree | 44f433cdce0aea74d1098967ff28454e512f777f /drivers/firmware/efi/vars.c | |
| parent | bf3738e51576cd0cd8c59ef611734cc423323563 (diff) | |
| parent | fc40eed01c76797b6f71c982a782cef2d6ab48a6 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/libfdt' into linux-linaro-lsk
Conflicts:
drivers/of/fdt.c
Diffstat (limited to 'drivers/firmware/efi/vars.c')
0 files changed, 0 insertions, 0 deletions