diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2012-02-07 17:20:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-09 00:07:03 +0100 |
| commit | 15f51136719699d7204eeeccd66849a4d90ae426 (patch) | |
| tree | f8fdfc59a098dfbe6be4f30999476b58b219d476 /drivers/base/cpu.c | |
| parent | docbook: fix fatal errors in device-drivers docbook and add DMA Management se... (diff) | |
| download | linux-15f51136719699d7204eeeccd66849a4d90ae426.tar.xz linux-15f51136719699d7204eeeccd66849a4d90ae426.zip | |
ACPI: remove duplicated lines of merging problems with acpi_processor_add
Those lines have two copies.
Not sure how it could happen, looks like git problem.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/cpu.c')
0 files changed, 0 insertions, 0 deletions