| commit | 9a49a14da4afe2c4ab7d7025a2f7f0f99a1c90e0 | |
| author | Daniel Sangorrin <daniel.sangorrin@gmail.com> | |
| Fri, 18 Jun 2010 06:30:02 +0000 (18 15:30 +0900) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Wed, 30 Jun 2010 15:16:06 +0000 (30 08:16 -0700) | ||
| tree | 08f9a79995e4ec461def50eac47aad51b1b30263 | treesnapshot (tar.gz zip) |
| parent | 64d65872f96e2a754caa12ef48949c314384bd9f | commitdiff |
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 <daniel.sangorrin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 <daniel.sangorrin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| drivers/usb/serial/ftdi_sio.c | diffblobblamehistory | |
| drivers/usb/serial/ftdi_sio_ids.h | diffblobblamehistory |