git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8facd5f
da241ef
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Wed, 3 Apr 2013 05:31:54 +0000
(
01:31
-0400)
committer
David S. Miller
<davem@davemloft.net>
Wed, 3 Apr 2013 05:31:54 +0000
(
01:31
-0400)
Pull net into net-next to get the synchronize_net() bug fix in
bonding.
Signed-off-by: David S. Miller <davem@davemloft.net>
1
2
drivers/net/bonding/bond_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/addrconf.c
patch
|
diff1
|
diff2
|
blob
|
history
net/vmw_vsock/vmci_transport.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/bonding/bond_main.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
Simple merge
diff --cc
net/ipv6/addrconf.c
Simple merge
diff --cc
net/vmw_vsock/vmci_transport.c
Simple merge