]> git.baikalelectronics.ru Git - kernel.git/commit
ACPI: remove duplicated lines of merging problems with acpi_processor_add
authorYinghai Lu <yinghai@kernel.org>
Tue, 7 Feb 2012 16:20:37 +0000 (08:20 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Feb 2012 23:07:03 +0000 (15:07 -0800)
commit24ec6f08833c4ca0aef23c60b02cc1f20288f8d0
treef8fdfc59a098dfbe6be4f30999476b58b219d476
parent0334db97d2fe8bfa95fa31adc2d992f4ea86910f
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>
drivers/acpi/processor_driver.c