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
..
adapter.h	netdev: convert bulk of drivers to netdev_tx_t	2009-09-01 01:14:07 -07:00
ael1002.c	cxgb3: use request_firmware() for the EDC registers setup	2009-07-08 10:54:24 -07:00
aq100x.c	cxgb3: AQ100X phy support update	2009-07-08 10:54:18 -07:00
common.h	cxgb3: use request_firmware() for the EDC registers setup	2009-07-08 10:54:24 -07:00
cxgb3_ctl_defs.h	cxgb3: add control to access embedded images	2008-12-26 01:16:39 -08:00
cxgb3_defs.h
cxgb3_ioctl.h
cxgb3_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-09-14 10:37:28 -07:00
cxgb3_offload.c	RDMA/cxgb3: Handle port events properly	2009-09-05 20:22:38 -07:00
cxgb3_offload.h	RDMA/cxgb3: Handle port events properly	2009-09-05 20:22:38 -07:00
firmware_exports.h
l2t.c
l2t.h
Makefile	cxgb3: add support for the Aquantia 10G-BT phy	2009-05-29 15:55:05 -07:00
mc5.c
regs.h	cxgb3: detect mac link faults.	2009-03-13 11:30:47 -07:00
sge.c	netdev: convert bulk of drivers to netdev_tx_t	2009-09-01 01:14:07 -07:00
sge_defs.h
t3_cpl.h
t3_hw.c	cxgb3: fix 2 ports 1G regression	2009-08-05 20:28:27 -07:00
t3cdev.h
version.h	cxgb3: Update FW to 7.4.0	2009-06-03 21:01:50 -07:00
vsc8211.c	cxgb3: Use generic MDIO definitions and mdio_mii_ioctl()	2009-04-29 17:32:32 -07:00
xgmac.c	cxgb3: Fix T3C MAC max packet size access	2009-07-08 10:54:22 -07:00