git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

author	David S. Miller <davem@davemloft.net>
	Tue, 23 Sep 2014 16:09:27 +0000 (12:09 -0400)
committer	David S. Miller <davem@davemloft.net>
	Tue, 23 Sep 2014 16:09:27 +0000 (12:09 -0400)
commit	1f6d80358dc9bbbeb56cb43384fa11fd645d9289
tree	152bfa5165292a8e4f06d536b6d222a68480e573	tree \| snapshot (tar.gz zip)
parent	a2aeb02a8e6a9fef397c344245a54eeae67341f6	commit \| diff
parent	98f75b8291a89ba6bf73e322ee467ce0bfeb91c1	commit \| diff

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

Conflicts:
arch/mips/net/bpf_jit.c
drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

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

46 files changed:

Documentation/networking/filter.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/mips/net/bpf_jit.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/flexcan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/3com/3c59x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/arc/emac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/b44.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bcmsysport.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sun/sunvnet.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/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-7000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/coex.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/fw-api.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/power.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/sf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/drv.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx4/device.h	diff1 \|	diff2 \|	blob \| history
include/net/addrconf.h	diff1 \|	diff2 \|	blob \| history
include/net/sch_generic.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/Kbuild	diff1 \|	diff2 \|	blob \| history
lib/rhashtable.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/anycast.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/datapath.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_choke.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

Documentation/networking/filter.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/mips/net/bpf_jit.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/flexcan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/3com/3c59x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/arc/emac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/b44.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bcmsysport.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sun/sunvnet.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/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-7000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/coex.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/fw-api.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/power.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/sf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/drv.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx4/device.h	diff1 \|	diff2 \|	blob \| history
include/net/addrconf.h	diff1 \|	diff2 \|	blob \| history
include/net/sch_generic.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/Kbuild	diff1 \|	diff2 \|	blob \| history
lib/rhashtable.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/anycast.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/datapath.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_choke.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history