Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43154d08 authored May 25, 2008 by David S. Miller

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

Conflicts:

	drivers/net/cpmac.c
	net/mac80211/mlme.c

parents 03194379 289c79a4

drivers/atm/fore200e.h

+0 −1

Original line number	Diff line number	Diff line
		/* $Id: fore200e.h,v 1.4 2000/04/14 10:10:34 davem Exp $ */
		#ifndef _FORE200E_H
		#define _FORE200E_H

drivers/atm/fore200e_mkfirm.c

+0 −2

Original line number	Diff line number	Diff line
		/*
		$Id: fore200e_mkfirm.c,v 1.1 2000/02/21 16:04:32 davem Exp $

		mkfirm.c: generates a C readable file from a binary firmware image

		Christophe Lizzi (lizzi@{csti.fr, cnam.fr}), June 1999.

drivers/atm/he.h

+0 −2

Original line number	Diff line number	Diff line
		/* $Id: he.h,v 1.4 2003/05/06 22:48:00 chas Exp $ */

		/*

		he.h

drivers/atm/idt77252.c

+0 −7

Original line number	Diff line number	Diff line
		/*******************************************************************
		* ident "$Id: idt77252.c,v 1.2 2001/11/11 08:13:54 ecd Exp $"
		*
		* $Author: ecd $
		* $Date: 2001/11/11 08:13:54 $
		*
		* Copyright (c) 2000 ATecoM GmbH
		*
		@@ -29,9 +25,6 @@
		* 675 Mass Ave, Cambridge, MA 02139, USA.
		*
		*******************************************************************/
		static char const rcsid[] =
		"$Id: idt77252.c,v 1.2 2001/11/11 08:13:54 ecd Exp $";


		#include <linux/module.h>
		#include <linux/pci.h>

drivers/atm/idt77252.h

+0 −4

Original line number	Diff line number	Diff line
		/*******************************************************************
		* ident "$Id: idt77252.h,v 1.2 2001/11/11 08:13:54 ecd Exp $"
		*
		* $Author: ecd $
		* $Date: 2001/11/11 08:13:54 $
		*
		* Copyright (c) 2000 ATecoM GmbH
		*