Merge branch 's390-net'
authorDavid S. Miller <davem@davemloft.net>
Wed, 12 Oct 2016 05:56:10 +0000 (01:56 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 12 Oct 2016 05:56:10 +0000 (01:56 -0400)
Ursula Braun says:

====================
s390: af_iucv patches

here are 2 patches for the s390-only af_iucv socket family code.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge