From: Daniel Sangorrin Date: Fri, 18 Jun 2010 06:30:02 +0000 (+0900) Subject: USB: serial: ftdi: correct merge conflict with CONTEC id X-Git-Tag: v2.6.35-rc4~18^2~11 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a49a14da4afe2c4ab7d7025a2f7f0f99a1c90e0;p=pandora-kernel.git USB: serial: ftdi: correct merge conflict with CONTEC id This patch corrects a problem with the merge of a previous patch to add the CONTEC identifier. I believe the merge problem occurred with the commit: dee5658b482e9e2ac7d6205dc876fc11d4008138 Originally I submitted a patch and then they asked me to order the IDs and resubmit, so did I. But unfortunately in the end somehow both patches were merged. Signed-off-by: Daniel Sangorrin Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed