Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source

Mainline had UFO fixes, but UFO is removed in net-next so we
take the HEAD hunks.

Minor context conflict in bcmsysport statistics bug fix.

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

...

This commit is contained in:

David S. Miller 2017-08-10 12:11:16 -07:00

parent 2e2d5d767c 26273939ac

commit 3b2b69efec

25 changed files with 188 additions and 47 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/linux/device.h

View file

4

include/linux/pinctrl/pinconf-generic.h

View file