diff options
| author | Graeme Gregory <graeme.gregory@linaro.org> | 2013-09-25 17:14:31 +0100 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-09-25 17:14:31 +0100 |
| commit | a2e9f3073cc4ca259bba5906ac4f69fe12189770 (patch) | |
| tree | fbd3750e68d7c6f5ecab59a8d7dd6d5c212fccd4 /block | |
| parent | 882ad6f719d2fffca930b2dc8f820cd0a390f101 (diff) | |
| parent | 399913a27a52c82abcdb606480652274c7ea8d53 (diff) | |
Merge branch 'acpi' of git://git.linaro.org/arm/acpi/acpi into leg-kernelleg-20130925.0
Conflicts:
arch/arm/Kconfig
arch/arm/kernel/setup.c
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions