]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6ca96c3 1d98049)
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)
commitb7b45d9076d3c672b66cece9a88434406789bd40
tree180bcb2d09e3db27050658afc36d5bac88593ed5tree | snapshot
parent6ca96c32e25c56d01c9097f7c8ef4da605e76310commit | diff
parent1d98049798f0e08e2aa01c6fd83d00afa48847d9commit | diff
Merge git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.