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

Conflicts:
	drivers/net/bnx2x/bnx2x_ethtool.c

2011-04-19 00:21:33 -07:00

..

bitfield.h

…

efx.c

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

2011-04-19 00:21:33 -07:00

efx.h

sfc: Update copyright dates

2011-02-28 23:57:24 +00:00

enum.h

…

ethtool.c

ethtool: allow custom interval for physical identification

2011-04-14 21:15:49 -07:00

falcon_boards.c

sfc: Update copyright dates

2011-02-28 23:57:24 +00:00

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

sfc: Implement hardware acceleration of RFS

2011-02-17 21:00:33 +00:00

filter.h

sfc: Generalise filter spec initialisation

2010-12-07 19:11:26 +00:00

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

sfc: Add support for SFE4003 board and TXC43128 PHY

2010-09-22 13:26:45 -07:00

mcdi_mac.c

sfc: make function tables const

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

mcdi_pcol.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

mcdi_phy.c

sfc: make function tables const

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

mcdi.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

mcdi.h

sfc: Update copyright dates

2011-02-28 23:57:24 +00:00

mdio_10g.c

sfc: Update copyright dates

2011-02-28 23:57:24 +00:00

mdio_10g.h

sfc: Update copyright dates

2011-02-28 23:57:24 +00:00

mtd.c

sfc: Update copyright dates

2011-02-28 23:57:24 +00:00

net_driver.h

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

2011-04-19 00:21:33 -07:00

nic.c

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

2011-04-19 00:21:33 -07:00

nic.h

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

2011-04-19 00:21:33 -07: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

sfc: Update copyright dates

2011-02-28 23:57:24 +00:00

rx.c

sfc: Implement generic features interface

2011-04-05 15:00:02 +01:00

selftest.c

sfc: Do not use efx_process_channel_now() in online self-test

2011-04-12 16:37:54 +01:00

selftest.h

sfc: Update copyright dates

2011-02-28 23:57:24 +00:00

siena.c

sfc: make function tables const

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

spi.h

sfc: Update copyright dates

2011-02-28 23:57:24 +00:00

tenxpress.c

sfc: make function tables const

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

tx.c

sfc: Stop the TX queues during loopback self-tests

2011-04-12 16:20:25 +01:00

txc43128_phy.c

sfc: make function tables const

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

workarounds.h

sfc: Siena: Disable write-combining when SR-IOV is enabled

2011-03-23 01:35:15 +00:00