git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit

]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit

projects / mirror_ubuntu-eoan-kernel.git / commit

author	David S. Miller <davem@davemloft.net>
	Sat, 15 Mar 2014 02:31:55 +0000 (22:31 -0400)
committer	David S. Miller <davem@davemloft.net>
	Sat, 15 Mar 2014 02:31:55 +0000 (22:31 -0400)
commit	85dcce7a73f1cc59f7a96fe52713b1630f4ca272
tree	6c645923eb2f0152073b90685ce80e46cfb7afed	tree
parent	4c4e4113db249c828fffb286bc95ffb255e081f5	commit \| diff
parent	a4ecdf82f8ea49f7d3a072121dcbd0bf3a7cb93a	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/usb/r8152.c
drivers/net/xen-netback/netback.c

Both the r8152 and netback conflicts were simple overlapping
changes.

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

33 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_alb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_options.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/rndis_filter.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ieee802154/at86rf230.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/bt-coex.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/11ac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/11n.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/interface.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/netback.c	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan_dev.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_core.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ppp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/chan.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_api.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history

Ubuntu Eoan Linux kernel mirror

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_alb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_options.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/rndis_filter.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ieee802154/at86rf230.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/bt-coex.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/11ac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/11n.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/interface.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/netback.c	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan_dev.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_core.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ppp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/chan.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_api.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history