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
..
ipoib_cm.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-09-14 10:37:28 -07:00
ipoib_ethtool.c	IPoIB: Clean up ethtool support	2008-10-22 15:49:29 -07:00
ipoib_fs.c	RDMA: Remove subversion $Id tags	2008-07-14 23:48:44 -07:00
ipoib_ib.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-09-14 10:37:28 -07:00
ipoib_main.c	IPoIB: Drop priv->lock before calling ipoib_send()	2009-09-05 20:23:40 -07:00
ipoib_multicast.c	IPoIB: Check multicast address format	2009-09-05 20:23:40 -07:00
ipoib_verbs.c	IPoIB: Get rid of ipoib_mcast_detach() wrapper	2008-07-14 23:48:50 -07:00
ipoib_vlan.c	net: Fix ipoib rtnl_lock sysfs deadlock.	2009-05-18 22:15:59 -07:00
ipoib.h	infiniband: remove IPOIB_GID_RAW_ARG, IPOIB_GID_ARG, IPOIB_GID_FMT	2008-10-28 23:02:37 -07:00
Kconfig	IPoIB: Correct help text for INFINIBAND_IPOIB_DEBUG	2008-07-24 20:37:25 -07:00
Makefile	IPoIB: Add basic ethtool support	2008-04-16 21:09:32 -07:00