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

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Wed, 28 Jan 2015 00:59:56 +0000 (16:59 -0800)
committer	David S. Miller <davem@davemloft.net>
	Wed, 28 Jan 2015 00:59:56 +0000 (16:59 -0800)
commit	95f873f2fff96c592c5d863e2a39825bd8bf0500
tree	0d2dd664964ba2c701aefea5b4d1e85b481045e1	tree \| snapshot
parent	8ea65f4a2dfaaf494ef42a16cbf2fea39b07450f	commit \| diff
parent	59343cd7c4809cf7598789e1cd14563780ae4239	commit \| diff

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

Conflicts:
arch/arm/boot/dts/imx6sx-sdb.dts
net/sched/cls_bpf.c

Two simple sets of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

42 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/rk3288-evb.dtsi	diff1 \|	diff2 \|	blob \| history
drivers/clk/rockchip/clk-rk3288.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/c_can/c_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/m_can/m_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cisco/enic/enic_main.c	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/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/neterion/s2io.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l3_main.c	diff1 \|	diff2 \|	blob \| history
include/net/genetlink.h	diff1 \|	diff2 \|	blob \| history
include/net/ip.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_sockglue.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/pm.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.h	diff1 \|	diff2 \|	blob \| history
net/netlink/genetlink.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_bpf.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/rk3288-evb.dtsi	diff1 \|	diff2 \|	blob \| history
drivers/clk/rockchip/clk-rk3288.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/c_can/c_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/m_can/m_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cisco/enic/enic_main.c	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/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/neterion/s2io.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l3_main.c	diff1 \|	diff2 \|	blob \| history
include/net/genetlink.h	diff1 \|	diff2 \|	blob \| history
include/net/ip.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_sockglue.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/pm.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.h	diff1 \|	diff2 \|	blob \| history
net/netlink/genetlink.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_bpf.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	diff1 \|	diff2 \|	blob \| history