diff options
author | Graeme Gregory <graeme.gregory@linaro.org> | 2013-08-19 13:45:21 +0100 |
---|---|---|
committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-08-19 13:45:21 +0100 |
commit | 6fd1e55b9ffd8b6fbd13dde54099b6db117eac26 (patch) | |
tree | c12bcf1619a015ebd4de42b5b0fff0c48d38d117 /arch/x86 | |
parent | eb40469d289660386ed4c4bb1bc839d5ad395069 (diff) | |
parent | 50ff73f763197ac6dac05067c8842e3b6e82f508 (diff) |
Merge branch 'acpi-llct' of git://git.linaro.org/arm/acpi/acpi into leg-kernelleg-20130819.0
Conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions