diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-24 23:03:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-24 23:03:21 +0100 |
| commit | c69294e957dd173809ec7815231e6aff6d5c2d83 (patch) | |
| tree | ce9801ec11db70553ed55a4c58eb95a22af6cefc /include/linux/kallsyms.h | |
| parent | bcddae4453f74e9d1dbc8db78c5c9bc552c600cb (diff) | |
| parent | 2edcb9f57bdaef4d4dc3f0f13c3a2b320b07fdf7 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-efi' into linux-linaro-lsk
Conflicts:
arch/arm64/kernel/Makefile
arch/arm64/kernel/head.S
Diffstat (limited to 'include/linux/kallsyms.h')
0 files changed, 0 insertions, 0 deletions