| commit | 3cef5c5b0b56f3f90b0e9ff8d3f8dc57f464cc14 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Mar 09 23:38:02 2015 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Mon Mar 09 23:38:02 2015 -0400 |
| tree | 02e95f15bd8a04071a9a36f534a92a066a8ce66a | |
| parent | 8ac467e837a24eb024177b4b01013d8e6764913a [diff] | |
| parent | affb8172de395a6e1db52ed9790ca0456d8c29a9 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/cadence/macb.c Overlapping changes in macb driver, mostly fixes and cleanups in 'net' overlapping with the integration of at91_ether into macb in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>