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

Browse source

The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.

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

...

This commit is contained in:

David S. Miller 2015-04-14 15:44:14 -04:00

parent 5e0e0dc10a b50edd7812

commit 87ffabb1f0

17 changed files with 85 additions and 37 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

1

include/linux/brcmphy.h

View file