David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/amd/xgbe/xgbe-desc.c drivers/net/ethernet/renesas/sh_eth.c Overlapping changes in both conflict cases. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-12-10 15:48:20 -05:00
..
6lowpan	net/6lowpan: Remove FSF address from GPL statement.	2014-12-05 12:43:04 +01:00
9p	…
802	…
8021q	vlan: Pass ethtool get_ts_info queries to real device.	2014-11-21 15:35:53 -05:00
appletalk	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
atm	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
ax25	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
batman-adv	…
bluetooth	Merge branch 'for-davem-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-12-10 13:17:23 -05:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2014-12-05 20:56:46 -08:00
caif	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
can	can: fix spelling errors	2014-12-07 21:22:05 +01:00
ceph	libceph: change from BUG to WARN for __remove_osd() asserts	2014-11-13 22:26:34 +03:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
dcb	dcbnl : Disable software interrupts before taking dcb_lock	2014-11-16 14:50:52 -05:00
dccp	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
decnet	new helper: memcpy_to_msg()	2014-11-24 04:28:51 -05:00
dns_resolver	…
dsa	net: dsa: replace count*size kzalloc by kcalloc	2014-11-16 14:41:39 -05:00
ethernet	…
hsr	…
ieee802154	Merge tag 'master-2014-12-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2014-12-09 18:12:03 -05:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
ipx	switch ipxrtr_route_packet() from iovec to msghdr	2014-11-24 04:28:49 -05:00
irda	irda: Convert function pointer arrays and uses to const	2014-12-10 15:33:16 -05:00
iucv	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
key	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
l2tp	ip_generic_getfrag, udplite_getfrag: switch to passing msghdr	2014-12-09 16:28:22 -05:00
lapb	lapb: move EXPORT_SYMBOL after functions.	2014-10-24 15:51:42 -04:00
llc	llc: Make llc_sap_action_t function pointer arrays const	2014-12-10 15:21:24 -05:00
mac80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-12-08 13:58:58 -05:00
mac802154	mac802154: use goto label on failure	2014-12-05 14:18:42 +01:00
mpls	net: Remove MPLS GSO feature.	2014-11-05 23:52:33 -08:00
netfilter	dst: no need to take reference on DST_NOCACHE dsts	2014-12-09 16:08:17 -05:00
netlabel	…
netlink	netlink: use jhash as hashfn for rhashtable	2014-12-10 15:17:45 -05:00
netrom	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
nfc	Merge tag 'master-2014-12-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2014-12-09 18:12:03 -05:00
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
packet	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
phonet	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
rds	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
rfkill	…
rose	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
rxrpc	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
sunrpc	SUNRPC: Fix locking around callback channel reply receive	2014-11-19 12:03:20 -05:00
switchdev	bridge: call netdev_sw_port_stp_update when bridge port STP status changes	2014-12-02 20:01:22 -08:00
tipc	tipc: fix broadcast wakeup contention after congestion	2014-12-10 14:45:33 -05:00
unix	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
vmw_vsock	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
wimax	…
wireless	cfg80211: remove unneeded initialisations in nl80211_set_reg	2014-11-28 14:54:31 +01:00
x25	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
xfrm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2014-12-08 21:30:21 -05:00
Kconfig	net: introduce generic switch devices support	2014-12-02 20:01:20 -08:00
Makefile	net: introduce generic switch devices support	2014-12-02 20:01:20 -08:00
compat.c	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
nonet.c	…
socket.c	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
sysctl_net.c	…