git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1a69205 0bad909)

author	David S. Miller <davem@davemloft.net>
	Fri, 21 Aug 2015 18:44:04 +0000 (11:44 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 21 Aug 2015 18:44:04 +0000 (11:44 -0700)
commit	dc25b25897289bad4907f30151ffe5baf75ff369
tree	c99301de2cdf66d7af48fc43b6161bda6faaae70	tree \| snapshot
parent	1a69205c471221a7f9101df164642611e37c52e4	commit \| diff
parent	0bad90985d39e69ca035fdd70bcc743812641d18	commit \| diff

Merge git://git./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

John Crispins staging tree