David S. Miller 29fda25a2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two minor conflicts in virtio_net driver (bug fix overlapping addition of a helper) and MAINTAINERS (new driver edit overlapping revamp of PHY entry). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-01 10:07:50 -07:00
..
ipw2x00	wireless: ipw2100: constify attribute_group structures.	2017-07-18 12:04:56 -07:00
iwlegacy	wireless: iwlegacy: Constify attribute_group structures.	2017-07-18 12:04:56 -07:00
iwlwifi	iwlwifi: mvm: defer setting IWL_MVM_STATUS_IN_HW_RESTART	2017-07-21 12:26:39 +03:00
Kconfig	iwlwifi: move under intel vendor directory	2015-11-18 14:28:30 +02:00
Makefile	iwlwifi: move under intel vendor directory	2015-11-18 14:28:30 +02:00