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

Commit 126a031e 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: (25 commits)
  TIPC: Removed inactive maintainer
  isdn: Cleanup Sections in PCMCIA driver elsa
  isdn: Cleanup Sections in PCMCIA driver avma1
  isdn: Cleanup Sections in PCMCIA driver teles
  isdn: Cleanup Sections in PCMCIA driver sedlbauer
  via-velocity: Fix FLOW_CNTL_TX_RX handling in set_mii_flow_control()
  netfilter: xt_hashlimit: IPV6 bugfix
  netfilter: ip6table_raw: fix table priority
  netfilter: xt_hashlimit: dl_seq_stop() fix
  af_key: return error if pfkey_xfrm_policy2msg_prep() fails
  skbuff: remove unused dma_head & dma_maps fields
  vlan: updates vlan real_num_tx_queues
  vlan: adds vlan_dev_select_queue
  igb: only use vlan_gro_receive if vlans are registered
  igb: do not modify tx_queue_len on link speed change
  igb: count Rx FIFO errors correctly
  bnx2: Use proper handler during netpoll.
  bnx2: Fix netpoll crash.
  ksz884x: fix return value of netdev_set_eeprom
  cgroups: net_cls as module
  ...
parents 01e77706 7c9f7573

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -5423,7 +5423,6 @@ S: Maintained 
F:	sound/soc/codecs/twl4030*



TIPC NETWORK LAYER

M:	Per Liden <per.liden@ericsson.com>

M:	Jon Maloy <jon.maloy@ericsson.com>

M:	Allan Stephens <allan.stephens@windriver.com>

L:	tipc-discussion@lists.sourceforge.net

drivers/isdn/hisax/avma1_cs.c

+6 −6
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ module_param(isdnprot, int, 0); 
   handler.

*/



static int avma1cs_config(struct pcmcia_device *link);

static int avma1cs_config(struct pcmcia_device *link) __devinit ;

static void avma1cs_release(struct pcmcia_device *link);



/*
@@ -59,7 +59,7 @@ static void avma1cs_release(struct pcmcia_device *link); 
   needed to manage one actual PCMCIA card.

*/



static void avma1cs_detach(struct pcmcia_device *p_dev);

static void avma1cs_detach(struct pcmcia_device *p_dev) __devexit ;





/*
@@ -99,7 +99,7 @@ typedef struct local_info_t { 
    

======================================================================*/



static int avma1cs_probe(struct pcmcia_device *p_dev)

static int __devinit avma1cs_probe(struct pcmcia_device *p_dev)

{

    local_info_t *local;
@@ -140,7 +140,7 @@ static int avma1cs_probe(struct pcmcia_device *p_dev) 


======================================================================*/



static void avma1cs_detach(struct pcmcia_device *link)

static void __devexit avma1cs_detach(struct pcmcia_device *link)

{

	dev_dbg(&link->dev, "avma1cs_detach(0x%p)\n", link);

	avma1cs_release(link);
@@ -174,7 +174,7 @@ static int avma1cs_configcheck(struct pcmcia_device *p_dev, 
}





static int avma1cs_config(struct pcmcia_device *link)

static int __devinit avma1cs_config(struct pcmcia_device *link)

{

    local_info_t *dev;

    int i;
@@ -282,7 +282,7 @@ static struct pcmcia_driver avma1cs_driver = { 
		.name	= "avma1_cs",

	},

	.probe		= avma1cs_probe,

	.remove		= avma1cs_detach,

	.remove		= __devexit_p(avma1cs_detach),

	.id_table	= avma1cs_ids,

};

drivers/isdn/hisax/elsa_cs.c

+6 −6
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ module_param(protocol, int, 0); 
   handler.

*/



static int elsa_cs_config(struct pcmcia_device *link);

static int elsa_cs_config(struct pcmcia_device *link) __devinit ;

static void elsa_cs_release(struct pcmcia_device *link);



/*
@@ -85,7 +85,7 @@ static void elsa_cs_release(struct pcmcia_device *link); 
   needed to manage one actual PCMCIA card.

*/



static void elsa_cs_detach(struct pcmcia_device *p_dev);

static void elsa_cs_detach(struct pcmcia_device *p_dev) __devexit;



/*

   A driver needs to provide a dev_node_t structure for each device
@@ -121,7 +121,7 @@ typedef struct local_info_t { 


======================================================================*/



static int elsa_cs_probe(struct pcmcia_device *link)

static int __devinit elsa_cs_probe(struct pcmcia_device *link)

{

    local_info_t *local;
@@ -166,7 +166,7 @@ static int elsa_cs_probe(struct pcmcia_device *link) 


======================================================================*/



static void elsa_cs_detach(struct pcmcia_device *link)

static void __devexit elsa_cs_detach(struct pcmcia_device *link)

{

	local_info_t *info = link->priv;
@@ -210,7 +210,7 @@ static int elsa_cs_configcheck(struct pcmcia_device *p_dev, 
	return -ENODEV;

}



static int elsa_cs_config(struct pcmcia_device *link)

static int __devinit elsa_cs_config(struct pcmcia_device *link)

{

    local_info_t *dev;

    int i;
@@ -327,7 +327,7 @@ static struct pcmcia_driver elsa_cs_driver = { 
		.name	= "elsa_cs",

	},

	.probe		= elsa_cs_probe,

	.remove		= elsa_cs_detach,

	.remove		= __devexit_p(elsa_cs_detach),

	.id_table	= elsa_ids,

	.suspend	= elsa_suspend,

	.resume		= elsa_resume,

drivers/isdn/hisax/sedlbauer_cs.c

+6 −6
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ module_param(protocol, int, 0); 
   event handler. 

*/



static int sedlbauer_config(struct pcmcia_device *link);

static int sedlbauer_config(struct pcmcia_device *link) __devinit ;

static void sedlbauer_release(struct pcmcia_device *link);



/*
@@ -85,7 +85,7 @@ static void sedlbauer_release(struct pcmcia_device *link); 
   needed to manage one actual PCMCIA card.

*/



static void sedlbauer_detach(struct pcmcia_device *p_dev);

static void sedlbauer_detach(struct pcmcia_device *p_dev) __devexit;



/*

   You'll also need to prototype all the functions that will actually
@@ -129,7 +129,7 @@ typedef struct local_info_t { 
    

======================================================================*/



static int sedlbauer_probe(struct pcmcia_device *link)

static int __devinit sedlbauer_probe(struct pcmcia_device *link)

{

    local_info_t *local;
@@ -177,7 +177,7 @@ static int sedlbauer_probe(struct pcmcia_device *link) 


======================================================================*/



static void sedlbauer_detach(struct pcmcia_device *link)

static void __devexit sedlbauer_detach(struct pcmcia_device *link)

{

	dev_dbg(&link->dev, "sedlbauer_detach(0x%p)\n", link);
@@ -283,7 +283,7 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev, 






static int sedlbauer_config(struct pcmcia_device *link)

static int __devinit sedlbauer_config(struct pcmcia_device *link)

{

    local_info_t *dev = link->priv;

    win_req_t *req;
@@ -441,7 +441,7 @@ static struct pcmcia_driver sedlbauer_driver = { 
		.name	= "sedlbauer_cs",

	},

	.probe		= sedlbauer_probe,

	.remove		= sedlbauer_detach,

	.remove		= __devexit_p(sedlbauer_detach),

	.id_table	= sedlbauer_ids,

	.suspend	= sedlbauer_suspend,

	.resume		= sedlbauer_resume,

drivers/isdn/hisax/teles_cs.c

+6 −6
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ module_param(protocol, int, 0); 
   handler.

*/



static int teles_cs_config(struct pcmcia_device *link);

static int teles_cs_config(struct pcmcia_device *link) __devinit ;

static void teles_cs_release(struct pcmcia_device *link);



/*
@@ -66,7 +66,7 @@ static void teles_cs_release(struct pcmcia_device *link); 
   needed to manage one actual PCMCIA card.

*/



static void teles_detach(struct pcmcia_device *p_dev);

static void teles_detach(struct pcmcia_device *p_dev) __devexit ;



/*

   A linked list of "instances" of the teles_cs device.  Each actual
@@ -112,7 +112,7 @@ typedef struct local_info_t { 


======================================================================*/



static int teles_probe(struct pcmcia_device *link)

static int __devinit teles_probe(struct pcmcia_device *link)

{

    local_info_t *local;
@@ -156,7 +156,7 @@ static int teles_probe(struct pcmcia_device *link) 


======================================================================*/



static void teles_detach(struct pcmcia_device *link)

static void __devexit teles_detach(struct pcmcia_device *link)

{

	local_info_t *info = link->priv;
@@ -200,7 +200,7 @@ static int teles_cs_configcheck(struct pcmcia_device *p_dev, 
	return -ENODEV;

}



static int teles_cs_config(struct pcmcia_device *link)

static int __devinit teles_cs_config(struct pcmcia_device *link)

{

    local_info_t *dev;

    int i;
@@ -319,7 +319,7 @@ static struct pcmcia_driver teles_cs_driver = { 
		.name	= "teles_cs",

	},

	.probe		= teles_probe,

	.remove		= teles_detach,

	.remove		= __devexit_p(teles_detach),

	.id_table       = teles_ids,

	.suspend	= teles_suspend,

	.resume		= teles_resume,