Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ...

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

2010-03-08 16:55:37 +01:00

..

bitfield.h

sfc: Update version, copyright dates, authors

2009-11-29 17:23:58 -08:00

efx.c

net: convert multiple drivers to use netdev_for_each_mc_addr, part2

2010-02-18 14:47:49 -08:00

efx.h

sfc: Remove declarations of nonexistent functions

2010-02-03 19:12:46 -08:00

enum.h

sfc: Update version, copyright dates, authors

2009-11-29 17:23:58 -08:00

ethtool.c

sfc: Fix some incorrect or redundant comments

2010-02-03 19:12:47 -08:00

falcon_boards.c

sfc: SFE4002/SFN4112F: Widen temperature and voltage tolerances

2010-02-19 15:50:35 -08:00

falcon_gmac.c

sfc: Update version, copyright dates, authors

2009-11-29 17:23:58 -08:00

falcon_xmac.c

sfc: Include XGXS in XMAC link status check except in XGMII loopback

2009-12-23 19:09:05 -08:00

falcon.c

sfc: Fix some incorrect or redundant comments

2010-02-03 19:12:47 -08:00

io.h

sfc: Rename register I/O header and functions used by both Falcon and Siena

2009-10-24 04:27:04 -07:00

Kconfig

sfc: Add support for SFC9000 family (2)

2009-11-29 17:23:57 -08:00

mac.h

sfc: Update version, copyright dates, authors

2009-11-29 17:23:58 -08:00

Makefile

sfc: Add support for SFC9000 family (2)

2009-11-29 17:23:57 -08:00

mcdi_mac.c

sfc: Add support for SFC9000 family (1)

2009-11-29 17:23:56 -08:00

mcdi_pcol.h

sfc: Update MCDI protocol definitions

2010-02-03 19:12:43 -08:00

mcdi_phy.c

sfc: Replace PHY MDIO test with an 'alive' test

2010-02-03 19:12:44 -08:00

mcdi.c

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

2010-02-25 23:22:42 -08:00

mcdi.h

sfc: Implement NVRAM selftest for SFC9000 family

2010-02-03 19:12:45 -08:00

mdio_10g.c

sfc: Replace PHY MDIO test with an 'alive' test

2010-02-03 19:12:44 -08:00

mdio_10g.h

sfc: Replace PHY MDIO test with an 'alive' test

2010-02-03 19:12:44 -08:00

mtd.c

sfc: Use fixed-size buffers for MCDI NVRAM requests

2010-01-25 15:49:59 -08:00

net_driver.h

sfc: Do not include unneeded headers

2010-02-03 19:12:47 -08:00

nic.c

sfc: Fix some incorrect or redundant comments

2010-02-03 19:12:47 -08:00

nic.h

sfc: Update version, copyright dates, authors

2009-11-29 17:23:58 -08:00

phy.h

sfc: Update version, copyright dates, authors

2009-11-29 17:23:58 -08:00

qt202x_phy.c

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

2010-02-14 22:30:54 -08:00

regs.h

tree-wide: Assorted spelling fixes

2010-02-09 11:13:56 +01:00

rx.c

sfc: Update version, copyright dates, authors

2009-11-29 17:23:58 -08:00

selftest.c

sfc: Do not include unneeded headers

2010-02-03 19:12:47 -08:00

selftest.h

sfc: Replace PHY MDIO test with an 'alive' test

2010-02-03 19:12:44 -08:00

siena.c

sfc: Add some missing bits to register self-test masks

2010-02-03 19:12:46 -08:00

spi.h

sfc: Extend MTD driver for use with new NICs

2009-11-29 17:23:54 -08:00

tenxpress.c

sfc: Replace PHY MDIO test with an 'alive' test

2010-02-03 19:12:44 -08:00

tx.c

sfc: Fix DMA mapping cleanup in case of an error in TSO

2009-12-23 19:09:05 -08:00

workarounds.h

sfc: Update version, copyright dates, authors

2009-11-29 17:23:58 -08:00