OSDN Git Service

(root) / tomoyo / tomoyo-test1.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a3fde2a 2391f0b)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 Dec 2017 15:44:19 +0000 (10:44 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Dec 2017 15:44:19 +0000 (10:44 -0500)
commit7cda4cee1366fae236678a5a6b124bab86b14973
tree180bcb2d09e3db27050658afc36d5bac88593ed5tree | snapshot
parenta3fde2addd5f0218b64102005a237ef727b0dc30commit | diff
parent2391f0b4808e3d5af348324d69f5f45c56a26836commit | diff
Merge git://git./linux/kernel/git/davem/net

Small overlapping change conflict ('net' changed a line,
'net-next' added a line right afterwards) in flexcan.c

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/can/flexcan.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.c diff1 | diff2 | blob | history
drivers/net/phy/micrel.c diff1 | diff2 | blob | history
drivers/net/tun.c diff1 | diff2 | blob | history
This is a test repository.
About OSDN
Find Software
Develop Software
Help