| commit | 71a83a6db6138b9d41d8a0b6b91cb59f6dc4742c | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Mar 03 21:16:48 2015 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Tue Mar 03 21:16:48 2015 -0500 |
| tree | f74b6e4e48257ec6ce40b95645ecb8533b9cc1f8 | |
| parent | b97526f3ff95f92b107f0fb52cbb8627e395429b [diff] | |
| parent | a6c5170d1edea97c538c81e377e56c7b5c5b7e63 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>