Merge branch 's390-next'
authorDavid S. Miller <davem@davemloft.net>
Sun, 18 Jan 2015 04:55:04 +0000 (23:55 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 18 Jan 2015 04:55:04 +0000 (23:55 -0500)
Ursula Braun says:

====================
s390: network patches for net-next

here are some s390 related patches for net-next
====================

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

Trivial merge