Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (a319a277) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/networking/LICENSE.qla3xxx

0 → 100644

+46 −0

Original line number	Original line	Diff line number	Diff line
			Copyright (c) 2003-2006 QLogic Corporation
			QLogic Linux Networking HBA Driver

			This program includes a device driver for Linux 2.6 that may be
			distributed with QLogic hardware specific firmware binary file.
			You may modify and redistribute the device driver code under the
			GNU General Public License as published by the Free Software
			Foundation (version 2 or a later version).

			You may redistribute the hardware specific firmware binary file
			under the following terms:

			1. Redistribution of source code (only if applicable),
			must retain the above copyright notice, this list of
			conditions and the following disclaimer.

			2. Redistribution in binary form must reproduce the above
			copyright notice, this list of conditions and the
			following disclaimer in the documentation and/or other
			materials provided with the distribution.

			3. The name of QLogic Corporation may not be used to
			endorse or promote products derived from this software
			without specific prior written permission

			REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,
			THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "AS IS'' AND ANY
			EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
			IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
			PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
			BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
			EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
			TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
			DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
			ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
			OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
			OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
			POSSIBILITY OF SUCH DAMAGE.

			USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT
			CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR
			OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,
			TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN
			ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN
			COMBINATION WITH THIS PROGRAM.

MAINTAINERS

+32 −5

Original line number	Original line	Diff line number	Diff line
	@@ -457,9 +457,9 @@ L: linux-hams@vger.kernel.org
	W: http://www.baycom.org/~tom/ham/ham.html		W: http://www.baycom.org/~tom/ham/ham.html
	S: Maintained		S: Maintained

	BCM43XX WIRELESS DRIVER		BCM43XX WIRELESS DRIVER (SOFTMAC BASED VERSION)
	P: Michael Buesch		P: Larry Finger
	M: mb@bu3sch.de		M: Larry.Finger@lwfinger.net
	P: Stefano Brivio		P: Stefano Brivio
	M: st3@riseup.net		M: st3@riseup.net
	W: http://bcm43xx.berlios.de/		W: http://bcm43xx.berlios.de/
	@@ -2389,6 +2389,12 @@ M: linux-driver@qlogic.com
	L: linux-scsi@vger.kernel.org		L: linux-scsi@vger.kernel.org
	S: Supported		S: Supported

			QLOGIC QLA3XXX NETWORK DRIVER
			P: Ron Mercer
			M: linux-driver@qlogic.com
			L: netdev@vger.kernel.org
			S: Supported

	QNX4 FILESYSTEM		QNX4 FILESYSTEM
	P: Anders Larsen		P: Anders Larsen
	M: al@alarsen.net		M: al@alarsen.net
	@@ -2641,6 +2647,18 @@ P: Nicolas Pitre
	M: nico@cam.org		M: nico@cam.org
	S: Maintained		S: Maintained

			SOFTMAC LAYER (IEEE 802.11)
			P: Johannes Berg
			M: johannes@sipsolutions.net
			P: Joe Jezak
			M: josejx@gentoo.org
			P: Daniel Drake
			M: dsd@gentoo.org
			W: http://softmac.sipsolutions.net/
			L: softmac-dev@sipsolutions.net
			L: netdev@vger.kernel.org
			S: Maintained

	SOFTWARE RAID (Multiple Disks) SUPPORT		SOFTWARE RAID (Multiple Disks) SUPPORT
	P: Ingo Molnar		P: Ingo Molnar
	M: mingo@redhat.com		M: mingo@redhat.com
	@@ -2922,8 +2940,8 @@ W: http://www.auk.cx/tms380tr/
	S: Maintained		S: Maintained

	TULIP NETWORK DRIVER		TULIP NETWORK DRIVER
	P: Jeff Garzik		P: Valerie Henson
	M: jgarzik@pobox.com		M: val_henson@linux.intel.com
	L: tulip-users@lists.sourceforge.net		L: tulip-users@lists.sourceforge.net
	W: http://sourceforge.net/projects/tulip/		W: http://sourceforge.net/projects/tulip/
	S: Maintained		S: Maintained
	@@ -3374,6 +3392,15 @@ W: http://www.qsl.net/dl1bke/
	L: linux-hams@vger.kernel.org		L: linux-hams@vger.kernel.org
	S: Maintained		S: Maintained

			ZD1211RW WIRELESS DRIVER
			P: Daniel Drake
			M: dsd@gentoo.org
			P: Ulrich Kunitz
			M: kune@deine-taler.de
			W: http://zd1211.ath.cx/wiki/DriverRewrite
			L: zd1211-devs@lists.sourceforge.net (subscribers-only)
			S: Maintained

	ZF MACHZ WATCHDOG		ZF MACHZ WATCHDOG
	P: Fernando Fuganti		P: Fernando Fuganti
	M: fuganti@netbank.com.br		M: fuganti@netbank.com.br

drivers/isdn/i4l/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5,6 +5,7 @@
	config ISDN_PPP		config ISDN_PPP
	bool "Support synchronous PPP"		bool "Support synchronous PPP"
	depends on INET		depends on INET
			select SLHC
	help		help
	Over digital connections such as ISDN, there is no need to		Over digital connections such as ISDN, there is no need to
	synchronize sender and recipient's clocks with start and stop bits		synchronize sender and recipient's clocks with start and stop bits

drivers/net/3c501.c

+30 −31

Original line number	Original line	Diff line number	Diff line
	@@ -120,7 +120,6 @@ static const char version[] =
	#include <linux/slab.h>		#include <linux/slab.h>
	#include <linux/string.h>		#include <linux/string.h>
	#include <linux/errno.h>		#include <linux/errno.h>
	#include <linux/config.h> /* for CONFIG_IP_MULTICAST */
	#include <linux/spinlock.h>		#include <linux/spinlock.h>
	#include <linux/ethtool.h>		#include <linux/ethtool.h>
	#include <linux/delay.h>		#include <linux/delay.h>
	@@ -882,7 +881,7 @@ static void netdev_set_msglevel(struct net_device *dev, u32 level)
	debug = level;		debug = level;
	}		}

	static struct ethtool_ops netdev_ethtool_ops = {		static const struct ethtool_ops netdev_ethtool_ops = {
	.get_drvinfo = netdev_get_drvinfo,		.get_drvinfo = netdev_get_drvinfo,
	.get_msglevel = netdev_get_msglevel,		.get_msglevel = netdev_get_msglevel,
	.set_msglevel = netdev_set_msglevel,		.set_msglevel = netdev_set_msglevel,

drivers/net/3c501.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@ static void el_reset(struct net_device *dev);
	static int el1_close(struct net_device *dev);		static int el1_close(struct net_device *dev);
	static struct net_device_stats el1_get_stats(struct net_device dev);		static struct net_device_stats el1_get_stats(struct net_device dev);
	static void set_multicast_list(struct net_device *dev);		static void set_multicast_list(struct net_device *dev);
	static struct ethtool_ops netdev_ethtool_ops;		static const struct ethtool_ops netdev_ethtool_ops;

	#define EL1_IO_EXTENT 16		#define EL1_IO_EXTENT 16

	@@ -37,7 +37,7 @@ struct net_local
	spinlock_t lock; /* Serializing lock */		spinlock_t lock; /* Serializing lock */
	};		};


	#define RX_STATUS (ioaddr + 0x06)		#define RX_STATUS (ioaddr + 0x06)
	#define RX_CMD RX_STATUS		#define RX_CMD RX_STATUS
	#define TX_STATUS (ioaddr + 0x07)		#define TX_STATUS (ioaddr + 0x07)