diff options
| author | Daniel Sangorrin <daniel.sangorrin@gmail.com> | 2010-06-18 06:30:02 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-30 15:16:06 (GMT) |
| commit | 9a49a14da4afe2c4ab7d7025a2f7f0f99a1c90e0 (patch) | |
| tree | 08f9a79995e4ec461def50eac47aad51b1b30263 /fs/proc/proc_net.c | |
| parent | 64d65872f96e2a754caa12ef48949c314384bd9f (diff) | |
| download | linux-9a49a14da4afe2c4ab7d7025a2f7f0f99a1c90e0.tar.xz | |
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>
Diffstat (limited to 'fs/proc/proc_net.c')
0 files changed, 0 insertions, 0 deletions