David S. Miller 0fa74a4be4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be_main.c net/core/sysctl_net_core.c net/ipv4/inet_diag.c The be_main.c conflict resolution was really tricky. The conflict hunks generated by GIT were very unhelpful, to say the least. It split functions in half and moved them around, when the real actual conflict only existed solely inside of one function, that being be_map_pci_bars(). So instead, to resolve this, I checked out be_main.c from the top of net-next, then I applied the be_main.c changes from 'net' since the last time I merged. And this worked beautifully. The inet_diag.c and sysctl_net_core.c conflicts were simple overlapping changes, and were easily to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-20 18:51:09 -04:00
..
ath	Major changes:	2015-03-06 15:46:08 -05:00
b43	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
b43legacy	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
cw1200	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
hostap	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
ipw2x00	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
iwlegacy	Major changes:	2015-03-06 15:46:08 -05:00
iwlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
libertas	Major changes:	2015-03-06 15:46:08 -05:00
libertas_tf	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
mwifiex	Major changes:	2015-03-06 15:46:08 -05:00
orinoco	orinoco: constify of_device_id array	2015-03-17 15:00:22 -04:00
p54	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
prism54	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
rsi	rsi: fix memory leak in rsi_load_ta_instructions()	2014-12-24 17:26:08 +02:00
rt2x00	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2015-02-19 10:36:45 -08:00
rtl818x	rtl818x_pci: fix response rate may be incorrect.	2014-10-07 14:48:37 -04:00
rtlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
ti	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
zd1211rw	zd1211rw: fix misspelling of current function in string	2014-12-15 13:46:19 -05:00
adm8211.c	adm8211: fix error return code	2015-01-15 14:44:42 +02:00
adm8211.h
airo_cs.c	airo_cs: Remove typedef local_info_t	2014-08-11 12:19:53 -07:00
airo.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
airo.h
at76c50x-usb.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
at76c50x-usb.h
atmel_cs.c	atmel_cs: Remove typedef local_info_t	2014-08-25 16:17:41 -04:00
atmel_pci.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
atmel.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
atmel.h
Kconfig	net: fix USB network driver config option.	2014-08-06 16:00:20 -07:00
mac80211_hwsim.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
mac80211_hwsim.h	mac80211-hwsim: Add HWSIM_CMD_GET_RADIO command	2014-11-19 18:59:32 +01:00
Makefile
mwl8k.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
ray_cs.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
ray_cs.h	ray_cs: Add include guards	2014-08-28 14:41:56 -04:00
rayctl.h	ray_cs: Add include guards	2014-08-28 14:41:56 -04:00
rndis_wlan.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
wl3501_cs.c
wl3501.h
zd1201.c
zd1201.h