diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-14 01:23:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-14 01:23:11 +0200 |
| commit | 182ad468e70fc7e8ff2e5d64344c690beaa00ddd (patch) | |
| tree | af0b9b8da89ed03629c71f6829845c301485d289 /drivers/net/ethernet/mellanox/mlxsw/pci.c | |
| parent | documentation: bring vxlan documentation more up-to-date (diff) | |
| parent | Merge tag 'dm-4.2-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/d... (diff) | |
| download | linux-182ad468e70fc7e8ff2e5d64344c690beaa00ddd.tar.xz linux-182ad468e70fc7e8ff2e5d64344c690beaa00ddd.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlxsw/pci.c')
0 files changed, 0 insertions, 0 deletions