FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-23 09:56:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
71380f9bb1
linux/drivers/vhost
History
David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-10 18:32:51 -05:00
..
Kconfig tcm_vhost: Initial merge for vhost level target fabric driver 2012-07-29 13:49:10 -07:00
Kconfig.tcm tcm_vhost: Initial merge for vhost level target fabric driver 2012-07-29 13:49:10 -07:00
Makefile tcm_vhost: Initial merge for vhost level target fabric driver 2012-07-29 13:49:10 -07:00
net.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-10 18:32:51 -05:00
tcm_vhost.c vhost: move -net specific code out 2012-11-02 21:29:58 -04:00
tcm_vhost.h tcm_vhost: Convert I/O path to use target_submit_cmd_map_sgls 2012-10-02 14:16:20 -07:00
test.c vhost: Separate vhost-net features from vhost features 2012-07-22 01:21:53 +03:00
test.h vhost test module 2010-12-09 16:00:21 +02:00
vhost.c vhost: move -net specific code out 2012-11-02 21:29:58 -04:00
vhost.h vhost: move -net specific code out 2012-11-02 21:29:58 -04:00