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)
commite9bcbc970a774bc8e17fd7eb24b9969be67d666e
treeaf8d8ad62a6b81cc570cdfed83496872e670e909
parent078252e0e877b50fcd42d3bd0d112f1f7c8518e8
parenta68be015aece7b9f33f1523048e445b72ca7111d
Merge branch 's390-next'

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>