From: David S. Miller <davem@davemloft.net>
Date: Mon, 21 Sep 2015 23:03:05 +0000 (-0700)
Subject: Merge branch 's390-next'
X-Git-Tag: KARO-TX6UL-2015-11-03~90^2~276
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=21fe8af40024c49af37124bc7b19c5836d25695e;p=karo-tx-linux.git

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>
---

21fe8af40024c49af37124bc7b19c5836d25695e