summaryrefslogtreecommitdiffstats
path: root/drivers/dio
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-02-07 08:20:37 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-08 15:07:03 -0800
commit15f51136719699d7204eeeccd66849a4d90ae426 (patch)
treef8fdfc59a098dfbe6be4f30999476b58b219d476 /drivers/dio
parent26417d475709adeddf1eedfc05ad5129b3ba7da6 (diff)
downloadlinux-15f51136719699d7204eeeccd66849a4d90ae426.tar.bz2
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/dio')
0 files changed, 0 insertions, 0 deletions