Merge pull request #2915 from vinaykul/master

diff --cc Makefile.am
Simple merge

diff --cc man/systemd.network.xml
index f2e715cf6f3b18af079275cabebec34dff3f7f45,8611c0032d65517b927a3e6aba0ca918f6d2fcc3..b2e1d402874e3e3d46268114b126aa445b8f9ff1
--- 1/man/systemd.network.xml
--- 2/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@@ -204,6 -204,12 +204,12 @@@
            understood to the base of 1024.</para>
          </listitem>
        </varlistentry>
 -        <term><varname>IAIDValue=</varname></term>
+       <varlistentry>
++        <term><varname>IAID=</varname></term>
+         <listitem>
+           <para>Identity Association Identifier for the interface, a 32-bit unsigned integer.</para>
+         </listitem>
+       </varlistentry>
      </variablelist>
    </refsect1>
  

diff --cc src/network/networkd-link.c
Simple merge