From: Yinghai Lu <yinghai@kernel.org>
Date: Tue, 7 Feb 2012 16:20:37 +0000 (-0800)
Subject: ACPI: remove duplicated lines of merging problems with acpi_processor_add
X-Git-Tag: v3.3-rc4~41^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15f51136719699d7204eeeccd66849a4d90ae426;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed