| commit | 182ad468e70fc7e8ff2e5d64344c690beaa00ddd | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Aug 13 16:23:11 2015 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Aug 13 16:23:11 2015 -0700 |
| tree | af0b9b8da89ed03629c71f6829845c301485d289 | |
| parent | e8fed985d7bd6cda695e196028b54a5f3d2d91bb [diff] | |
| parent | 5b3e2e14eaa2a98232a4f292341fb88438685734 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/cavium/Kconfig The cavium conflict was overlapping dependency changes. Signed-off-by: David S. Miller <davem@davemloft.net>