David S. Miller 3c709f8fb4 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6 ...

Conflicts:
	drivers/net/benet/be_main.c

2011-05-11 14:26:58 -04:00

..

Makefile

…

pch_gbe_api.c

pch_gbe: make local functions static

2010-10-21 03:09:44 -07:00

pch_gbe_api.h

…

pch_gbe_ethtool.c

ethtool: Use full 32 bit speed range in ethtool's set_settings

2011-04-29 14:03:00 -07:00

pch_gbe_main.c

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

2011-05-11 14:26:58 -04:00

pch_gbe_param.c

net: pch_gbe: convert to hw_features

2011-04-20 01:30:43 -07:00

pch_gbe_phy.c

ethtool: cosmetic: Use ethtool ethtool_cmd_speed API

2011-04-29 14:03:01 -07:00

pch_gbe_phy.h

…

pch_gbe.h

net: pch_gbe: convert to hw_features

2011-04-20 01:30:43 -07:00