This repository has been archived on 2026-03-14. You can view files and clone it, but cannot push or open issues or pull requests.

David S. Miller ca1ba7caa6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next ...

Conflicts:
	drivers/net/ethernet/intel/e1000e/netdev.c

2011-08-20 17:25:36 -07:00

..

e1000

…

e1000e

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next

2011-08-20 17:25:36 -07:00

igb

…

igbvf

…

ixgb

…

ixgbe

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next

2011-08-20 17:25:36 -07:00

ixgbevf

…

e100.c

…

Kconfig

…

Makefile

…