]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 88d2c2e 44dc170)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 21 Aug 2015 18:44:04 +0000 (11:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 Aug 2015 18:44:04 +0000 (11:44 -0700)
commitb5756165b6e08cfdc6dbf4536e1a9a15476eb301
treec99301de2cdf66d7af48fc43b6161bda6faaae70tree | snapshot
parent88d2c2e53d19dc075bbc845b19d4d0aadef63ce6commit | diff
parent44dc170a31acbd143c3e173e69dddd5d9c3959fbcommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/usb/qmi_wwan.c

Overlapping additions of new device IDs to qmi_wwan.c

Signed-off-by: David S. Miller <davem@davemloft.net>
12 files changed:
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/boot/dts/dra7.dtsi diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/gianfar.c diff1 | diff2 | blob | history
drivers/net/phy/phy.c diff1 | diff2 | blob | history
drivers/net/usb/qmi_wwan.c diff1 | diff2 | blob | history
kernel/events/core.c diff1 | diff2 | blob | history
net/batman-adv/translation-table.c diff1 | diff2 | blob | history
net/bridge/br_multicast.c diff1 | diff2 | blob | history
net/ipv4/fib_trie.c diff1 | diff2 | blob | history
net/ipv6/ip6_fib.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.