David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/amd-xgbe-phy.c drivers/net/wireless/iwlwifi/Kconfig include/net/mac80211.h iwlwifi/Kconfig and mac80211.h were both trivial overlapping changes. The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and the bug fix that happened on the 'net' side is already integrated into the rest of the amd-xgbe driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-01 22:51:30 -07:00
..
Kconfig	vhost: Make vhost a separate module	2013-07-07 17:33:44 +03:00
Makefile	vhost: Make vhost a separate module	2013-07-07 17:33:44 +03:00
net.c	new helper: msg_data_left()	2015-04-11 15:53:35 -04:00
scsi.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
test.c	vhost: move memory pointer to VQs	2014-06-09 16:21:07 +03:00
test.h	vhost test module	2010-12-09 16:00:21 +02:00
vhost.c	vhost: switch vhost get_indirect() to iov_iter, kill memcpy_fromiovec()	2015-02-04 01:34:15 -05:00
vhost.h	vhost: remove unnecessary forward declarations in vhost.h	2014-12-09 12:06:33 +02:00
vringh.c	vringh: update for virtio 1.0 APIs	2014-12-15 23:49:28 +02:00