David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-01 17:06:14 -04:00
..
e1000	intel: Remove extern from function prototypes	2013-09-24 12:51:37 -07:00
e1000e	intel: Remove extern from function prototypes	2013-09-24 12:51:37 -07:00
i40e	i40e: clean up coccicheck reported errors	2013-09-27 05:24:05 -07:00
igb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-01 17:06:14 -04:00
igbvf	intel: Remove extern from function prototypes	2013-09-24 12:51:37 -07:00
ixgb	intel: Remove extern from function prototypes	2013-09-24 12:51:37 -07:00
ixgbe	ixgbe: remove marketing names from busy poll code	2013-10-01 12:49:49 -04:00
ixgbevf	ixgbevf: move API neg to reset path	2013-10-01 12:49:48 -04:00
e100.c	e100: dump small buffers via %*ph	2013-07-28 02:06:38 -07:00
Kconfig	i40e: include i40e in kernel proper	2013-09-11 02:28:40 -07:00
Makefile	i40e: include i40e in kernel proper	2013-09-11 02:28:40 -07:00