leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e92036a651
linux/drivers/virtio
History
David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
2011-11-21 13:50:33 -05:00
..
config.c
Kconfig virtio: Add platform bus driver for memory mapped virtio device 2011-11-02 11:41:01 +10:30
Makefile virtio: Add platform bus driver for memory mapped virtio device 2011-11-02 11:41:01 +10:30
virtio_balloon.c virtio: Add module.h to drivers/virtio users. 2011-10-31 19:32:14 -04:00
virtio_mmio.c enable virtio_net to return bus_info in ethtool -i consistent with emulated NICs 2011-11-16 17:26:46 -05:00
virtio_pci.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
virtio_ring.c virtio: Add module.h to drivers/virtio users. 2011-10-31 19:32:14 -04:00
virtio.c virtio: Add module.h to drivers/virtio users. 2011-10-31 19:32:14 -04:00