diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-24 11:58:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-24 11:58:51 +0200 |
| commit | 3a07bd6fead4f00f67b1bf5f551e686661c4f52c (patch) | |
| tree | f8b8f257d928a9ae1aeb3fdbe748f03f1012f02e /net/mac80211/rate.c | |
| parent | net: inet_diag: export IPV6_V6ONLY sockopt (diff) | |
| parent | stmmac: troubleshoot unexpected bits in des0 & des1 (diff) | |
| download | linux-3a07bd6fead4f00f67b1bf5f551e686661c4f52c.tar.xz linux-3a07bd6fead4f00f67b1bf5f551e686661c4f52c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/mellanox/mlx4/main.c
net/packet/af_packet.c
Both conflicts were cases of simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/rate.c')
0 files changed, 0 insertions, 0 deletions