| commit | 87ffabb1f055e14e7d171c6599539a154d647904 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Apr 14 15:44:14 2015 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Tue Apr 14 15:44:14 2015 -0400 |
| tree | 56f227c9cb668686ca5c2cd9a7ae188b74c0f2f2 | |
| parent | 5e0e0dc10a8be16239eae24ab775de60821eee2d [diff] | |
| parent | b50edd7812852d989f2ef09dcfc729690f54a42d [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 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>