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

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Wed, 23 Oct 2013 20:28:39 +0000 (16:28 -0400)
committer	David S. Miller <davem@davemloft.net>
	Wed, 23 Oct 2013 20:49:34 +0000 (16:49 -0400)
commit	c3fa32b9764dc45dcf8a2231b1c110abc4a63e0b
tree	6cf2896a77b65bec64284681e1c3851eb3263e09	tree \| snapshot
parent	34d92d5315b64a3e5292b7e9511c1bb617227fb6	commit \| diff
parent	320437af954cbe66478f1f5e8b34cb5a8d072191	commit \| diff

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

Conflicts:
drivers/net/usb/qmi_wwan.c
include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

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

43 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/can/at91_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/flexcan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/davicom/dm9000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.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/ethernet/ti/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hamradio/yam.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/qmi_wwan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/cw1200/cw1200_spi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/join.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c	diff1 \|	diff2 \|	blob \| history
include/net/dst.h	diff1 \|	diff2 \|	blob \| history
include/net/ip6_route.h	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_private.h	diff1 \|	diff2 \|	blob \| history
net/core/secure_seq.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_vti.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ppp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.h	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/can/at91_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/flexcan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/davicom/dm9000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.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/ethernet/ti/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hamradio/yam.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/qmi_wwan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/cw1200/cw1200_spi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/join.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c	diff1 \|	diff2 \|	blob \| history
include/net/dst.h	diff1 \|	diff2 \|	blob \| history
include/net/ip6_route.h	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_private.h	diff1 \|	diff2 \|	blob \| history
net/core/secure_seq.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_vti.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ppp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.h	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history