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: (21 commits) [TIPC]: Removing useless casts [IPV4]: Fix nexthop realm dumping for multipath routes [DUMMY]: Avoid an oops when dummy_init_one() failed [IFB] After ifb_init_one() failed, i is increased. Decrease [NET]: Fix reversed error test in netif_tx_trylock [MAINTAINERS]: Mark LAPB as Oprhan. [NET]: Conversions from kmalloc+memset to k(z|c)alloc. [NET]: sun happymeal, little pci cleanup [IrDA]: Use alloc_skb() in IrDA TX path [I/OAT]: Remove pci_module_init() from Intel I/OAT DMA engine [I/OAT]: net/core/user_dma.c should #include <net/netdma.h> [SCTP]: ADDIP: Don't use an address as source until it is ASCONF-ACKed [SCTP]: Set chunk->data_accepted only if we are going to accept it. [SCTP]: Verify all the paths to a peer via heartbeat before using them. [SCTP]: Unhash the endpoint in sctp_endpoint_free(). [SCTP]: Check for NULL arg to sctp_bucket_destroy(). [PKT_SCHED] netem: Fix slab corruption with netem (2nd try) [WAN]: Converted synclink drivers to use netif_carrier_*() [WAN]: Cosmetic changes to N2 and C101 drivers [WAN]: Added missing netif_dormant_off() to generic HDLC ...
Showing
- MAINTAINERS 1 addition, 3 deletionsMAINTAINERS
- drivers/char/pcmcia/synclink_cs.c 10 additions, 4 deletionsdrivers/char/pcmcia/synclink_cs.c
- drivers/char/synclink.c 10 additions, 4 deletionsdrivers/char/synclink.c
- drivers/char/synclink_gt.c 10 additions, 4 deletionsdrivers/char/synclink_gt.c
- drivers/char/synclinkmp.c 10 additions, 4 deletionsdrivers/char/synclinkmp.c
- drivers/dma/ioatdma.c 1 addition, 1 deletiondrivers/dma/ioatdma.c
- drivers/net/dummy.c 1 addition, 0 deletionsdrivers/net/dummy.c
- drivers/net/ifb.c 1 addition, 0 deletionsdrivers/net/ifb.c
- drivers/net/sunhme.c 2 additions, 7 deletionsdrivers/net/sunhme.c
- drivers/net/wan/c101.c 2 additions, 2 deletionsdrivers/net/wan/c101.c
- drivers/net/wan/hdlc_ppp.c 1 addition, 0 deletionsdrivers/net/wan/hdlc_ppp.c
- drivers/net/wan/hdlc_raw.c 1 addition, 0 deletionsdrivers/net/wan/hdlc_raw.c
- drivers/net/wan/hdlc_raw_eth.c 1 addition, 0 deletionsdrivers/net/wan/hdlc_raw_eth.c
- drivers/net/wan/hdlc_x25.c 1 addition, 0 deletionsdrivers/net/wan/hdlc_x25.c
- drivers/net/wan/n2.c 2 additions, 1 deletiondrivers/net/wan/n2.c
- include/linux/netdevice.h 3 additions, 3 deletionsinclude/linux/netdevice.h
- include/net/netdma.h 1 addition, 1 deletioninclude/net/netdma.h
- include/net/sctp/structs.h 6 additions, 5 deletionsinclude/net/sctp/structs.h
- include/net/sctp/user.h 9 additions, 0 deletionsinclude/net/sctp/user.h
- net/8021q/vlan.c 1 addition, 2 deletionsnet/8021q/vlan.c
Loading
Please register or sign in to comment