]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3948a34 da3482a)
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)
commita52adbdb7e1577bc10c2169150fd7cce9bb6b07c
tree180bcb2d09e3db27050658afc36d5bac88593ed5tree | snapshot
parent3948a3473ca694a30dbc7d387cf23b109b3ce2b8commit | diff
parentda3482a42c43bbe301ffba776eb49bd72d93b785commit | 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.