Merge commit 'refs/pull/436/head' of https://github.com/systemd/systemd
authorDavid Herrmann <dh.herrmann@gmail.com>
Tue, 14 Jul 2015 17:19:39 +0000 (19:19 +0200)
committerDavid Herrmann <dh.herrmann@gmail.com>
Tue, 14 Jul 2015 17:19:39 +0000 (19:19 +0200)
commitca970016b7e5176e94eee3af24a70d5b3355018f
tree6e08b30384bfd9ef8c881087bb1a034db10db366
parent73b836e22f6b42308e05df284b90ce2c9cb32af4
parent4c641e99fa1b32385b941cccccb566f5ddc9daed
Merge commit 'refs/pull/436/head' of https://github.com/systemd/systemd

This merges:
  sd-netlink: respect attribute type flags

..fixing a conflict due to a typo fix.
src/libsystemd/sd-netlink/netlink-internal.h