summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-09-21 16:03:05 -0700
committerDavid S. Miller <davem@davemloft.net>2015-09-21 16:03:05 -0700
commit21fe8af40024c49af37124bc7b19c5836d25695e (patch)
treef7a4f4801941ddbed1ae567b56121ec2db1492f4 /net/ipv4/tcp_input.c
parent5dcd2461073a43b2aa48ab5cfc135ba182667794 (diff)
parent91e60eb60bdf078fc58b8d2fd1ac12f3c09bb893 (diff)
downloadop-kernel-dev-21fe8af40024c49af37124bc7b19c5836d25695e.zip
op-kernel-dev-21fe8af40024c49af37124bc7b19c5836d25695e.tar.gz
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>
Diffstat (limited to 'net/ipv4/tcp_input.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud