systemd: merge branch systemd into master
authorThomas Haller <thaller@redhat.com>
Tue, 22 Mar 2016 12:57:47 +0000 (13:57 +0100)
committerThomas Haller <thaller@redhat.com>
Tue, 22 Mar 2016 13:03:39 +0000 (14:03 +0100)
Update systemd code from upstream. In the meantime, two
patches that we applied early in NetworkManager core were
applied in upstream systemd too. So, resync.

1  2 
src/systemd/src/basic/log.h
src/systemd/src/basic/macro.h
src/systemd/src/basic/util.h
src/systemd/src/libsystemd-network/lldp-neighbor.c

Simple merge
Simple merge
Simple merge