tree f8fdfc59a098dfbe6be4f30999476b58b219d476
parent 26417d475709adeddf1eedfc05ad5129b3ba7da6
author Yinghai Lu <yinghai@kernel.org> 1328631637 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1328742423 -0800

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>