David S. Miller 9cbc94eabb Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c

2011-05-17 17:33:11 -04:00

..

bitfield.h

…

efx.c

sfc: Use netif_device_{detach,attach}() around reset and self-test

2011-05-16 23:34:28 +01:00

efx.h

…

enum.h

…

ethtool.c

sfc: Fix return value from efx_ethtool_set_rx_ntuple()

2011-05-14 02:35:25 +01:00

falcon_boards.c

…

falcon_xmac.c

sfc: make function tables const

2011-04-14 21:53:42 -07:00

falcon.c

sfc: make function tables const

2011-04-14 21:53:42 -07:00

filter.c

…

filter.h

…

io.h

sfc: Use rmb() to ensure reads occur in order

2011-04-12 23:52:44 +01:00

Kconfig

…

mac.h

sfc: make function tables const

2011-04-14 21:53:42 -07:00

Makefile

…

mcdi_mac.c

sfc: make function tables const

2011-04-14 21:53:42 -07:00

mcdi_pcol.h

…

mcdi_phy.c

ethtool: cosmetic: Use ethtool ethtool_cmd_speed API

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

mcdi.c

sfc: Always map MCDI shared memory as uncacheable

2011-05-12 15:16:32 +01:00

mcdi.h

…

mdio_10g.c

ethtool: Call ethtool's get/set_settings callbacks with cleaned data

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

mdio_10g.h

…

mtd.c

…

net_driver.h

sfc: Use netif_device_{detach,attach}() around reset and self-test

2011-05-16 23:34:28 +01:00

nic.c

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

2011-05-17 17:33:11 -04:00

nic.h

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

2011-05-17 17:33:11 -04:00

phy.h

sfc: make function tables const

2011-04-14 21:53:42 -07:00

qt202x_phy.c

sfc: make function tables const

2011-04-14 21:53:42 -07:00

regs.h

…

rx.c

…

selftest.c

sfc: Use netif_device_{detach,attach}() around reset and self-test

2011-05-16 23:34:28 +01:00

selftest.h

…

siena.c

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

2011-05-17 17:33:11 -04:00

spi.h

…

tenxpress.c

ethtool: cosmetic: Use ethtool ethtool_cmd_speed API

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

tx.c

sfc: Use netif_device_{detach,attach}() around reset and self-test

2011-05-16 23:34:28 +01:00

txc43128_phy.c

sfc: make function tables const

2011-04-14 21:53:42 -07:00

workarounds.h

…