Merge branch 's390-next'
authorDavid S. Miller <davem@davemloft.net>
Sat, 31 May 2014 00:35:32 +0000 (17:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 31 May 2014 00:35:32 +0000 (17:35 -0700)
Frank Blaschka says:

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

here are some s390 related patches for net-next
Added some style fixing reported by David Laight.
====================

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

Trivial merge