Fixed 1.0 miss-merges
[tinc] / src / linux /
drwxr-xr-x   ..
-rw-r--r-- 5539 device.c