| commit | 22f10923dd39141785273e423b9acf347297e15f | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Dec 10 15:48:20 2014 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Wed Dec 10 15:48:20 2014 -0500 |
| tree | cc1f19103817433a426b3e329d6326f5e9d8e8f7 | |
| parent | 785c20a08bead1e58ad53f2dc324782da7a0c9ea [diff] | |
| parent | 69204cf7eb9c5a72067ce6922d4699378251d053 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/amd/xgbe/xgbe-desc.c drivers/net/ethernet/renesas/sh_eth.c Overlapping changes in both conflict cases. Signed-off-by: David S. Miller <davem@davemloft.net>