Linus Torvalds d7e9660ad9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits) netxen: update copyright netxen: fix tx timeout recovery netxen: fix file firmware leak netxen: improve pci memory access netxen: change firmware write size tg3: Fix return ring size breakage netxen: build fix for INET=n cdc-phonet: autoconfigure Phonet address Phonet: back-end for autoconfigured addresses Phonet: fix netlink address dump error handling ipv6: Add IFA_F_DADFAILED flag net: Add DEVTYPE support for Ethernet based devices mv643xx_eth.c: remove unused txq_set_wrr() ucc_geth: Fix hangs after switching from full to half duplex ucc_geth: Rearrange some code to avoid forward declarations phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs drivers/net/phy: introduce missing kfree drivers/net/wan: introduce missing kfree net: force bridge module(s) to be GPL Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded ... Fixed up trivial conflicts: - arch/x86/include/asm/socket.h converted to <asm-generic/socket.h> in the x86 tree. The generic header has the same new #define's, so that works out fine. - drivers/net/tun.c fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that switched over to using 'tun->socket.sk' instead of the redundantly available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks to the TUN driver") which added a new 'tun->sk' use. Noted in 'next' by Stephen Rothwell.		2009-09-14 10:37:28 -07:00
..
c2_ae.c	IB: Replace remaining __FUNCTION__ occurrences with __func__	2008-04-16 21:01:10 -07:00
c2_ae.h
c2_alloc.c	IB: Replace remaining __FUNCTION__ occurrences with __func__	2008-04-16 21:01:10 -07:00
c2_cm.c	RDMA/amso1100: Fix error path in c2_llp_accept()	2006-09-28 10:38:32 -07:00
c2_cq.c	infiniband: Remove void casts	2009-05-13 16:53:39 -07:00
c2_intr.c	RDMA/amso1100: Add check for NULL reply_msg in c2_intr()	2008-04-16 21:09:34 -07:00
c2_mm.c	RDMA/amso1100: Start of endianness annotation	2008-04-16 21:01:08 -07:00
c2_mq.c	RDMA/amso1100: Start of endianness annotation	2008-04-16 21:01:08 -07:00
c2_mq.h	RDMA/amso1100: Start of endianness annotation	2008-04-16 21:01:08 -07:00
c2_pd.c
c2_provider.c	RDMA/amso1100: Check kmalloc() result in c2_register_device()	2009-09-05 20:24:24 -07:00
c2_provider.h	IB/uverbs: Export ib_umem_get()/ib_umem_release() to modules	2007-05-08 18:00:37 -07:00
c2_qp.c	RDMA/amso1100: Add support for "send with invalidate" work requests	2008-04-16 21:09:32 -07:00
c2_rnic.c	RDMA/core: Add local DMA L_Key support	2008-07-14 23:48:53 -07:00
c2_status.h
c2_user.h
c2_vq.c	IB: Replace remaining __FUNCTION__ occurrences with __func__	2008-04-16 21:01:10 -07:00
c2_vq.h
c2_wr.h	RDMA/amso1100: Start of endianness annotation	2008-04-16 21:01:08 -07:00
c2.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-09-14 10:37:28 -07:00
c2.h	infiniband: convert c2 to net_device_ops	2009-03-21 19:19:13 -07:00
Kbuild
Kconfig	IB: Use menuconfig for InfiniBand menu	2007-07-09 20:12:26 -07:00