| commit | b633353115e352d3c31c12d4c61978c810f05ea1 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Feb 23 00:09:14 2016 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Tue Feb 23 00:09:14 2016 -0500 |
| tree | 055174a1b31a3e10fd2c505788fe6487b0028d00 | |
| parent | b1d95ae5c5bd3deba84d00c4f83d7d0836b5936f [diff] | |
| parent | dea08e604408d0303e2332896c5fdd8c1f7d79a2 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>