tree f7a4f4801941ddbed1ae567b56121ec2db1492f4
parent 5dcd2461073a43b2aa48ab5cfc135ba182667794
parent 91e60eb60bdf078fc58b8d2fd1ac12f3c09bb893
author David S. Miller <davem@davemloft.net> 1442876585 -0700
committer David S. Miller <davem@davemloft.net> 1442876585 -0700

Merge branch 's390-next'

Ursula Braun says:

====================
s390: qeth and iucv patches

here is version 2 of some s390 related qeth patches for net-next. The patch by
Thomas Richter adds a new feature to the qeth layer2 code; the remaining
patches are minor improvements.
Version 2 of patch 4 uses the desired indentation in function declarations
and definitions spanning multiple lines in almost all cases. Thomas run into a
conflict with the maximum number of columns once. Thus you will still see one
function definition using an earlier column before the opening paranthesis.
====================

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