]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #2685 from poettering/lldp-fixes2
authorTom Gundersen <teg@jklm.no>
Mon, 22 Feb 2016 16:38:34 +0000 (17:38 +0100)
committerTom Gundersen <teg@jklm.no>
Mon, 22 Feb 2016 16:38:34 +0000 (17:38 +0100)
lldp fixes, second iteration

1  2 
src/basic/missing.h
src/network/networkd-network.c
src/udev/udev.h

Simple merge
Simple merge
diff --cc src/udev/udev.h
Simple merge