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)
commit8c3295f447fb6bd8682509d7f15844fb61d0620e
tree90946611f0acdf6be6d5106d98e67f77dcf6687a
parentf29d90115f30410b58540b33239beec3ae89e4b8
parenta558dc99d6f940adda5aec406bb0135a3c842d18
systemd: merge branch systemd into master

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.
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