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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7b22a77 9c982e8)

author	David S. Miller <davem@davemloft.net>
	Thu, 31 Dec 2015 23:20:10 +0000 (18:20 -0500)
committer	David S. Miller <davem@davemloft.net>
	Thu, 31 Dec 2015 23:20:10 +0000 (18:20 -0500)
commit	c07f30ad68053181b3e8a0e65b0630e12e844f91
tree	8758968aabc844c435ff2a5d7d02c835fccd02a3	tree \| snapshot
parent	7b22a7788b0263f42f7232c5c05c503424ffa0ba	commit \| diff
parent	9c982e86dbdbaa3fb248dfc776dddda32cbc8927	commit \| diff

Merge git://git./linux/kernel/git/davem/net

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
crypto/algif_skcipher.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/cdc_ncm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-7000.c	diff1 \|	\|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/sta.c	diff1 \|	\|	blob \| history
lib/rhashtable.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_stp_if.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipip.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/conntrack.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree