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

Commit 74e651f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
  [TIPC]: Initial activation message now includes TIPC version number
  [TIPC]: Improve response to requests for node/link information
  [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf
  [IrDA]: Fix the AU1000 FIR dependencies
  [IrDA]: Fix RCU lock pairing on error path
  [XFRM]: unexport xfrm_state_mtu
  [NET]: make skb_release_data() static
  [NETFILTE] ipv4: Fix typo (Bugzilla #6753)
  [IrDA]: MCS7780 usb_driver struct should be static
  [BNX2]: Turn off link during shutdown
  [BNX2]: Use dev_kfree_skb() instead of the _irq version
  [ATM]: basic sysfs support for ATM devices
  [ATM]: [suni] change suni_init to __devinit
  [ATM]: [iphase] should be __devinit not __init
  [ATM]: [idt77105] should be __devinit not __init
  [BNX2]: Add NETIF_F_TSO_ECN
  [NET]: Add ECN support for TSO
  [AF_UNIX]: Datagram getpeersec
  [NET]: Fix logical error in skb_gso_ok
  [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000
  ...
parents 6002e450 0702056f

arch/x86_64/kernel/functionlist

+0 −1
Original line number Diff line number Diff line
@@ -384,7 +384,6 @@ 
*(.text.__end_that_request_first)

*(.text.wake_up_bit)

*(.text.unuse_mm)

*(.text.skb_release_data)

*(.text.shrink_icache_memory)

*(.text.sched_balance_self)

*(.text.__pmd_alloc)

drivers/atm/he.c

+1 −1
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ he_init_irq(struct he_dev *he_dev) 
	return 0;

}



static int __init

static int __devinit

he_start(struct atm_dev *dev)

{

	struct he_dev *he_dev;

drivers/atm/idt77105.c

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static const struct atmphy_ops idt77105_ops = { 
};





int idt77105_init(struct atm_dev *dev)

int __devinit idt77105_init(struct atm_dev *dev)

{

	dev->phy = &idt77105_ops;

	return 0;

drivers/atm/idt77105.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
#define IDT77105_CTRSEL_RHEC	0x01	/* W, Rx HEC Error Counter */



#ifdef __KERNEL__

int idt77105_init(struct atm_dev *dev) __init;

int idt77105_init(struct atm_dev *dev);

#endif



/*

drivers/atm/iphase.c

+2 −2
Original line number Diff line number Diff line
@@ -2284,7 +2284,7 @@ static int reset_sar(struct atm_dev *dev) 
}  

	  

	  

static int __init ia_init(struct atm_dev *dev)

static int __devinit ia_init(struct atm_dev *dev)

{  

	IADEV *iadev;  

	unsigned long real_base;
@@ -2480,7 +2480,7 @@ static void ia_free_rx(IADEV *iadev) 
			  iadev->rx_dle_dma);  

}



static int __init ia_start(struct atm_dev *dev)

static int __devinit ia_start(struct atm_dev *dev)

{  

	IADEV *iadev;  

	int error;