| commit | 06c54055bebf919249aa1eb68312887c3cfe77b4 | |
| author | David S. Miller <davem@davemloft.net> | |
| Thu, 5 Sep 2013 18:58:52 +0000 (5 14:58 -0400) | ||
| committer | David S. Miller <davem@davemloft.net> | |
| Thu, 5 Sep 2013 18:58:52 +0000 (5 14:58 -0400) | ||
| tree | 223a49c09e5d26516ed0161b8a52d08454ae028e | treesnapshot (tar.gz zip) |
| parent | 1a5bbfc3d6b700178b75743a2ba1fd2e58a8f36f | commitdiff |
| parent | e2e5c4c07caf810d7849658dca42f598b3938e21 | commitdiff |
Merge git://git./linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
net/bridge/br_multicast.c
net/ipv6/sit.c
The conflicts were minor:
1) sit.c changes overlap with change to ip_tunnel_xmit() signature.
2) br_multicast.c had an overlap between computing max_delay using
msecs_to_jiffies and turning MLDV2_MRC() into an inline function
with a name using lowercase instead of uppercase letters.
3) stmmac had two overlapping changes, one which conditionally allocated
and hooked up a dma_cfg based upon the presence of the pbl OF property,
and another one handling store-and-forward DMA made. The latter of
which should not go into the new of_find_property() basic block.
Signed-off-by: David S. Miller <davem@davemloft.net>
Conflicts:
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
net/bridge/br_multicast.c
net/ipv6/sit.c
The conflicts were minor:
1) sit.c changes overlap with change to ip_tunnel_xmit() signature.
2) br_multicast.c had an overlap between computing max_delay using
msecs_to_jiffies and turning MLDV2_MRC() into an inline function
with a name using lowercase instead of uppercase letters.
3) stmmac had two overlapping changes, one which conditionally allocated
and hooked up a dma_cfg based upon the presence of the pbl OF property,
and another one handling store-and-forward DMA made. The latter of
which should not go into the new of_find_property() basic block.
Signed-off-by: David S. Miller <davem@davemloft.net>
33 files changed: