git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

author	David S. Miller <davem@davemloft.net>
	Wed, 26 Mar 2014 00:29:20 +0000 (20:29 -0400)
committer	David S. Miller <davem@davemloft.net>
	Wed, 26 Mar 2014 00:29:20 +0000 (20:29 -0400)
commit	04f58c88542b6b351efb4eea01134eb672e22e6e
tree	47bb617212f8c8951f35730e324bdc43487a01ca	tree
parent	0fc31966035d7a540c011b6c967ce8eae1db121b	commit \| diff
parent	632b06aa2842b12c6d6a510ec080fb6ebdb38ea5	commit \| diff

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

Conflicts:
Documentation/devicetree/bindings/net/micrel-ks8851.txt
net/core/netpoll.c

The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.

In micrel-ks8851.txt we simply have overlapping changes.

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

19 files changed:

Documentation/devicetree/bindings/net/micrel-ks8851.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/alx/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/via/via-rhine.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/cdc_ncm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c	diff1 \|	diff2 \|	blob \| history
include/linux/usb/cdc_ncm.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/key/af_key.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/datapath.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
security/selinux/include/xfrm.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Documentation/devicetree/bindings/net/micrel-ks8851.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/alx/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/via/via-rhine.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/cdc_ncm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c	diff1 \|	diff2 \|	blob \| history
include/linux/usb/cdc_ncm.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/key/af_key.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/datapath.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
security/selinux/include/xfrm.h	diff1 \|	diff2 \|	blob \| history