Skip to content
Commit ca970016 authored by David Herrmann's avatar David Herrmann
Browse files

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.
parents 73b836e2 4c641e99
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment