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-rc3~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59c1204d464075fcb5d02e7daa6b23782dd4a088;p=pandora-kernel.git

ACPI: remove duplicated lines of merging problems with acpi_processor_add

Those lines have two copies.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

Reading git-diff-tree failed