Commit 2090af71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (166 commits)
  [PATCH] net: au1000_eth: PHY framework conversion
  [PATCH] 3c5zz ethernet: fix section warnings
  [PATCH] smc ethernet: fix section mismatch warnings
  [PATCH] hp ethernet: fix section mismatches
  [PATCH] Section mismatch in drivers/net/ne.o during modpost
  [PATCH] e1000: prevent statistics from getting garbled during reset
  [PATCH] smc911x Kconfig fix
  [PATCH] forcedeth: new device ids
  [PATCH] forcedeth config: version
  [PATCH] forcedeth config: module parameters
  [PATCH] forcedeth config: diagnostics
  [PATCH] forcedeth config: move functions
  [PATCH] forcedeth config: statistics
  [PATCH] forcedeth config: csum
  [PATCH] forcedeth config: wol
  [PATCH] forcedeth config: phy
  [PATCH] forcedeth config: flow control
  [PATCH] forcedeth config: ring sizes
  [PATCH] forcedeth config: tso cleanup
  [DOC] Update bonding documentation with sysfs info
  ...
parents 557240b4 4b6ace7f

Documentation/networking/README.ipw2200

+5 −5
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ Copyright (C) 2004-2006, Intel Corporation 


README.ipw2200



Version: 1.0.8

Date   : October 20, 2005

Version: 1.1.2

Date   : March 30, 2006





Index
@@ -103,7 +103,7 @@ file. 


1.1. Overview of Features

-----------------------------------------------

The current release (1.0.8) supports the following features:

The current release (1.1.2) supports the following features:



+ BSS mode (Infrastructure, Managed)

+ IBSS mode (Ad-Hoc)
@@ -247,8 +247,8 @@ and can set the contents via echo. For example: 
% cat /sys/bus/pci/drivers/ipw2200/debug_level



Will report the current debug level of the driver's logging subsystem 

(only available if CONFIG_IPW_DEBUG was configured when the driver was 

built).

(only available if CONFIG_IPW2200_DEBUG was configured when the driver

was built).



You can set the debug level via:

Documentation/networking/bonding.txt

+229 −94

File changed.

Preview size limit exceeded, changes collapsed.

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -1425,6 +1425,8 @@ P: Jesse Brandeburg 
M:	jesse.brandeburg@intel.com

P:	Jeff Kirsher

M:	jeffrey.t.kirsher@intel.com

P:	Auke Kok

M:	auke-jan.h.kok@intel.com

W:	http://sourceforge.net/projects/e1000/

S:	Supported
@@ -1437,6 +1439,8 @@ P: Jesse Brandeburg 
M:	jesse.brandeburg@intel.com

P:	Jeff Kirsher

M:	jeffrey.t.kirsher@intel.com

P:	Auke Kok

M:	auke-jan.h.kok@intel.com

W:	http://sourceforge.net/projects/e1000/

S:	Supported
@@ -1449,6 +1453,8 @@ P: John Ronciak 
M:	john.ronciak@intel.com

P:	Jesse Brandeburg

M:	jesse.brandeburg@intel.com

P:	Auke Kok

M:	auke-jan.h.kok@intel.com

W:	http://sourceforge.net/projects/e1000/

S:	Supported

drivers/net/3c501.c

+1 −1
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ MODULE_PARM_DESC(irq, "EtherLink IRQ number"); 
 * here also causes the module to be unloaded

 */

 

int init_module(void)

int __init init_module(void)

{

	dev_3c501 = el1_probe(-1);

	if (IS_ERR(dev_3c501))

drivers/net/3c503.c

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ MODULE_LICENSE("GPL"); 


/* This is set up so that only a single autoprobe takes place per call.

ISA device autoprobes on a running machine are not recommended. */

int

int __init

init_module(void)

{

	struct net_device *dev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE