From: David S. Miller <davem@davemloft.net>
Date: Mon, 22 Sep 2014 19:01:13 +0000 (-0400)
Subject: Merge branch 'be2net-next'
X-Git-Tag: v3.18-rc1~52^2~20
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5624e80f8dba63499684d8920733d7465ad7d14b;p=karo-tx-linux.git

Merge branch 'be2net-next'

Sathya Perla says:

====================
be2net: patch set

Patches 1 and 2 fix sparse warnings (static declaration needed and endian
declaration needed) introduced by the earlier patch set.

Patches 3 and 4 add 20G/40G speed reporting via ethtool for the Skyhawk-R
chip.

Patches 5 to 12 fix various style issues and checkpatch warnings in the
driver such as:
	- removing unnecessary return statements in void routines
	- adding needed blank lines after a declaration block
	- deleting multiple blank lines
	- inserting a blank line after a function/struct definition
	- removing space after typecast
	- fixing multiple assignments on a single line
	- fixing alignment on a line wrap
====================

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

5624e80f8dba63499684d8920733d7465ad7d14b