linux/drivers/net/e1000e
David S. Miller 9b963e5d0e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/ieee802154/fakehard.c
	drivers/net/e1000e/ich8lan.c
	drivers/net/e1000e/phy.c
	drivers/net/netxen/netxen_nic_init.c
	drivers/net/wireless/ath/ath9k/main.c
2009-11-29 00:57:15 -08:00
..
82571.c e1000e: cosmetic - group local variables of the same type 2009-11-21 11:34:30 -08:00
defines.h e1000e: update copyright information 2009-11-21 11:34:09 -08:00
e1000.h Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-29 00:57:15 -08:00
es2lan.c e1000e: cosmetic - group local variables of the same type 2009-11-21 11:34:30 -08:00
ethtool.c e1000e: update copyright information 2009-11-21 11:34:09 -08:00
hw.h e1000e: update copyright information 2009-11-21 11:34:09 -08:00
ich8lan.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-29 00:57:15 -08:00
lib.c e1000e: cleanup functions that clear hardware statistics 2009-11-21 11:34:21 -08:00
Makefile e1000e: reformat comment blocks, cosmetic changes only 2008-03-28 22:14:56 -04:00
netdev.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-29 00:57:15 -08:00
param.c e1000e: update copyright information 2009-11-21 11:34:09 -08:00
phy.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-29 00:57:15 -08:00