diff options
| author | Graeme Gregory <graeme.gregory@linaro.org> | 2013-09-06 10:26:37 +0100 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-09-06 10:26:37 +0100 |
| commit | e74f8d8bbd2d1256d0a154b596e47a157ea283d5 (patch) | |
| tree | 7677b6e9d9c4f19eed80086cca0a64b567ce83c8 /arch/xtensa | |
| parent | 8c3d931def3649410e65c8c50d535e1bbc937496 (diff) | |
| parent | 16d4c484405c1d3ca4c607332d01c9cefb903ab7 (diff) | |
Merge branch 'acpi-llct' of git://git.linaro.org/arm/acpi/acpi into leg-kernel
Conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'arch/xtensa')
0 files changed, 0 insertions, 0 deletions