projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
989e04c
a45e92a
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Sat, 23 Aug 2014 18:12:08 +0000
(11:12 -0700)
committer
David S. Miller
<davem@davemloft.net>
Sat, 23 Aug 2014 18:12:08 +0000
(11:12 -0700)
Pulling to get some TIPC fixes that a net-next series depends
upon.
Signed-off-by: David S. Miller <davem@davemloft.net>
1
2
drivers/net/can/flexcan.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/can/flexcan.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge