USB: serial: ftdi: correct merge conflict with CONTEC id
[sfrench/cifs-2.6.git] / drivers / staging / adis16255 /
drwxr-xr-x   ..
-rw-r--r-- 376 Kconfig
-rw-r--r-- 40 Makefile
-rw-r--r-- 10873 adis16255.c
-rw-r--r-- 151 adis16255.h