UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/net/ixgbe
History
David S. Miller 6b08f51624 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Conflicts:
	drivers/net/ixgbe/ixgbe_ethtool.c

With merge conflict help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2010-06-14 22:59:34 -07:00
..
Makefile Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-01-23 00:31:06 -08:00
ixgbe.h ixgbe: Use netdev_<level>, dev_<level>, pr_<level> 2010-06-03 20:02:41 -07:00
ixgbe_82598.c ixgbe:add support for a new 82599 10G Base-T device 2010-05-20 23:07:06 -07:00
ixgbe_82599.c ixgbe: Use netdev_<level>, dev_<level>, pr_<level> 2010-06-03 20:02:41 -07:00
ixgbe_common.c ixgbe: return IXGBE_ERR_RAR_INDEX when out of range 2010-06-03 03:28:28 -07:00
ixgbe_common.h ixgbe: Use netdev_<level>, dev_<level>, pr_<level> 2010-06-03 20:02:41 -07:00
ixgbe_dcb.c ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_dcb.h ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_dcb_82598.c ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_dcb_82598.h ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_dcb_82599.c ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_dcb_82599.h ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_dcb_nl.c ixgbe: Use netdev_<level>, dev_<level>, pr_<level> 2010-06-03 20:02:41 -07:00
ixgbe_ethtool.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-06-14 22:59:34 -07:00
ixgbe_fcoe.c ixgbe: Use netdev_<level>, dev_<level>, pr_<level> 2010-06-03 20:02:41 -07:00
ixgbe_fcoe.h ixgbe: update copyright dates 2010-01-13 17:12:45 -08:00
ixgbe_main.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-06-14 22:59:34 -07:00
ixgbe_mbx.c ixgbe: Mailbox header and code module 2010-01-10 13:34:24 -08:00
ixgbe_mbx.h ixgbe: Mailbox header and code module 2010-01-10 13:34:24 -08:00
ixgbe_phy.c ixgbe:add support for a new 82599 10G Base-T device 2010-05-20 23:07:06 -07:00
ixgbe_phy.h ixgbe:add support for a new 82599 10G Base-T device 2010-05-20 23:07:06 -07:00
ixgbe_sriov.c ixgbe: Use netdev_<level>, dev_<level>, pr_<level> 2010-06-03 20:02:41 -07:00
ixgbe_sriov.h ixgbe: Add support for VF MAC and VLAN configuration 2010-05-05 21:15:33 -07:00
ixgbe_type.h ixgbe: return IXGBE_ERR_RAR_INDEX when out of range 2010-06-03 03:28:28 -07:00