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

Commit e616c630 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
  pktgen: make sure that pktgen_thread_worker has been executed
  [VLAN]: Propagate selected feature bits to VLAN devices
  drivers/atm/: remove CVS keywords
  vlan: Correctly handle device notifications for layered VLAN devices
  net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags()
  net_sched: cls_api: fix return value for non-existant classifiers
  ipsec: Use the correct ip_local_out function
  ipv6 addrconf: Allow infinite prefix lifetime.
  ipv6 route: Fix lifetime in netlink.
  ipv6 addrconf: Fix route lifetime setting in corner case.
  ndisc: Add missing strategies for per-device retrans timer/reachable time settings.
  ipv6: Move <linux/in6.h> from header-y to unifdef-y.
  l2tp: avoid skb truesize bug if headroom is increased
  wireless: Create 'device' symlink in sysfs
  wireless, airo: waitbusy() won't delay
  libertas: fix command timeout after firmware failure
  mac80211: Add RTNL version of ieee80211_iterate_active_interfaces
  mac80211 : Association with 11n hidden ssid ap.
  hostap: fix "registers" registration in procfs
  isdn/capi: Return proper errnos on module init.
  ...
parents 789319db d3ede327

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 

 *